home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-10-28 | 53.3 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 30 3a 31 39 20 31 39 39 | 17 15:4|0:19 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 69 6e |.0/lisp/|ediff-in|
|00000080| 69 74 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |it.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n).. |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).| (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 69 6e 69 74 2e |or "`edi|ff-init.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 09 42 11 c2 |byte-cod|e "..B..|
|000001f0| 09 42 11 c3 09 42 11 c4 | 09 42 11 c5 09 42 11 c6 |.B...B..|.B...B..|
|00000200| 09 42 11 c7 09 42 11 c8 | 09 42 11 c9 ca 0e 0b 5c |.B...B..|.B.....\|
|00000210| 22 16 5c 66 cc 09 42 11 | 0e 5c 66 3f 16 0d cd 09 |".\f..B.|.\f?....|
|00000220| 42 11 c0 87 22 20 5b 65 | 64 69 66 66 2d 6d 65 74 |B..." [e|diff-met|
|00000230| 61 6a 6f 62 2d 6e 61 6d | 65 20 63 75 72 72 65 6e |ajob-nam|e curren|
|00000240| 74 2d 6c 6f 61 64 2d 6c | 69 73 74 20 65 64 69 66 |t-load-l|ist edif|
|00000250| 66 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 70 6d |f-meta-b|uffer pm|
|00000260| 2d 63 6f 6c 6f 72 2d 61 | 6c 69 73 74 20 65 64 69 |-color-a|list edi|
|00000270| 66 66 2d 67 72 61 62 2d | 6d 6f 75 73 65 20 65 64 |ff-grab-|mouse ed|
|00000280| 69 66 66 2d 6d 6f 75 73 | 65 2d 70 69 78 65 6c 2d |iff-mous|e-pixel-|
|00000290| 70 6f 73 69 74 69 6f 6e | 20 65 64 69 66 66 2d 6d |position| ediff-m|
|000002a0| 6f 75 73 65 2d 70 69 78 | 65 6c 2d 74 68 72 65 73 |ouse-pix|el-thres|
|000002b0| 68 6f 6c 64 20 65 64 69 | 66 66 2d 77 68 69 74 65 |hold edi|ff-white|
|000002c0| 73 70 61 63 65 20 65 64 | 69 66 66 2d 6d 75 6c 74 |space ed|iff-mult|
|000002d0| 69 66 72 61 6d 65 20 73 | 74 72 69 6e 67 2d 6d 61 |iframe s|tring-ma|
|000002e0| 74 63 68 20 22 58 45 6d | 61 63 73 22 20 65 6d 61 |tch "XEm|acs" ema|
|000002f0| 63 73 2d 76 65 72 73 69 | 6f 6e 20 65 64 69 66 66 |cs-versi|on ediff|
|00000300| 2d 78 65 6d 61 63 73 2d | 70 20 65 64 69 66 66 2d |-xemacs-|p ediff-|
|00000310| 65 6d 61 63 73 2d 70 5d | 20 33 29 0a 23 40 31 38 |emacs-p]| 3).#@18|
|00000320| 32 20 49 66 20 74 2c 20 | 45 64 69 66 66 20 77 69 |2 If t, |Ediff wi|
|00000330| 6c 6c 20 74 68 69 6e 6b | 20 74 68 61 74 20 69 74 |ll think| that it|
|00000340| 20 69 73 20 72 75 6e 6e | 69 6e 67 20 6f 6e 20 61 | is runn|ing on a|
|00000350| 20 64 69 73 70 6c 61 79 | 20 74 68 61 74 20 73 75 | display| that su|
|00000360| 70 70 6f 72 74 73 20 66 | 61 63 65 73 2e 0a 54 68 |pports f|aces..Th|
|00000370| 69 73 20 69 73 20 70 72 | 6f 76 69 64 65 64 20 61 |is is pr|ovided a|
|00000380| 73 20 61 20 74 65 6d 70 | 6f 72 61 72 79 20 72 65 |s a temp|orary re|
|00000390| 6c 69 65 66 20 66 6f 72 | 20 75 73 65 72 73 20 6f |lief for| users o|
|000003a0| 66 20 66 61 63 65 2d 63 | 61 70 61 62 6c 65 20 64 |f face-c|apable d|
|000003b0| 69 73 70 6c 61 79 73 0a | 74 68 61 74 20 45 64 69 |isplays.|that Edi|
|000003c0| 66 66 20 64 6f 65 73 6e | 27 74 20 6b 6e 6f 77 20 |ff doesn|'t know |
|000003d0| 61 62 6f 75 74 2e 1f 0a | 28 64 65 66 76 61 72 20 |about...|(defvar |
|000003e0| 65 64 69 66 66 2d 66 6f | 72 63 65 2d 66 61 63 65 |ediff-fo|rce-face|
|000003f0| 73 20 6e 69 6c 20 28 23 | 24 20 2e 20 38 30 32 29 |s nil (#|$ . 802)|
|00000400| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00000410| 66 66 2d 64 65 76 69 63 | 65 2d 74 79 70 65 20 23 |ff-devic|e-type #|
|00000420| 5b 6e 69 6c 20 22 08 83 | 06 00 09 87 c2 c3 20 21 |[nil "..|...... !|
|00000430| 87 22 20 5b 65 64 69 66 | 66 2d 65 6d 61 63 73 2d |." [edif|f-emacs-|
|00000440| 70 20 77 69 6e 64 6f 77 | 2d 73 79 73 74 65 6d 20 |p window|-system |
|00000450| 64 65 76 69 63 65 2d 74 | 79 70 65 20 73 65 6c 65 |device-t|ype sele|
|00000460| 63 74 65 64 2d 64 65 76 | 69 63 65 5d 20 32 5d 29 |cted-dev|ice] 2])|
|00000470| 0a 28 70 75 74 20 28 71 | 75 6f 74 65 20 65 64 69 |.(put (q|uote edi|
|00000480| 66 66 2d 64 65 76 69 63 | 65 2d 74 79 70 65 29 20 |ff-devic|e-type) |
|00000490| 28 71 75 6f 74 65 20 62 | 79 74 65 2d 6f 70 74 69 |(quote b|yte-opti|
|000004a0| 6d 69 7a 65 72 29 20 28 | 71 75 6f 74 65 20 62 79 |mizer) (|quote by|
|000004b0| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|000004c0| 65 2d 65 78 70 61 6e 64 | 29 29 0a 28 64 65 66 61 |e-expand|)).(defa|
|000004d0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 77 69 6e 64 |lias 'ed|iff-wind|
|000004e0| 6f 77 2d 64 69 73 70 6c | 61 79 2d 70 20 23 5b 6e |ow-displ|ay-p #[n|
|000004f0| 69 6c 20 22 08 83 08 00 | 09 82 5c 66 00 c2 c3 20 |il "....|..\f... |
|00000500| 21 85 1e 00 08 83 17 00 | 09 82 1b 00 c2 c3 20 21 |!.......|...... !|
|00000510| c4 3e 3f 87 22 20 5b 65 | 64 69 66 66 2d 65 6d 61 |.>?." [e|diff-ema|
|00000520| 63 73 2d 70 20 77 69 6e | 64 6f 77 2d 73 79 73 74 |cs-p win|dow-syst|
|00000530| 65 6d 20 64 65 76 69 63 | 65 2d 74 79 70 65 20 73 |em devic|e-type s|
|00000540| 65 6c 65 63 74 65 64 2d | 64 65 76 69 63 65 20 28 |elected-|device (|
|00000550| 74 74 79 20 70 63 20 73 | 74 72 65 61 6d 29 5d 20 |tty pc s|tream)] |
|00000560| 32 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |2]).(def|alias 'e|
|00000570| 64 69 66 66 2d 68 61 73 | 2d 66 61 63 65 2d 73 75 |diff-has|-face-su|
|00000580| 70 70 6f 72 74 2d 70 20 | 23 5b 6e 69 6c 20 22 c0 |pport-p |#[nil ".|
|00000590| 20 86 2f 00 09 86 2f 00 | 5c 6e 83 1c 00 5c 6e 83 | ./.../.|\n...\n.|
|000005a0| 15 00 0b 82 19 00 c4 c5 | 20 21 c6 3e 87 0e 07 85 |........| !.>....|
|000005b0| 2f 00 5c 6e 83 29 00 0b | 82 2d 00 c4 c5 20 21 c8 |/.\n.)..|.-... !.|
|000005c0| 3e 87 22 20 5b 65 64 69 | 66 66 2d 77 69 6e 64 6f |>." [edi|ff-windo|
|000005d0| 77 2d 64 69 73 70 6c 61 | 79 2d 70 20 65 64 69 66 |w-displa|y-p edif|
|000005e0| 66 2d 66 6f 72 63 65 2d | 66 61 63 65 73 20 65 64 |f-force-|faces ed|
|000005f0| 69 66 66 2d 65 6d 61 63 | 73 2d 70 20 77 69 6e 64 |iff-emac|s-p wind|
|00000600| 6f 77 2d 73 79 73 74 65 | 6d 20 64 65 76 69 63 65 |ow-syste|m device|
|00000610| 2d 74 79 70 65 20 73 65 | 6c 65 63 74 65 64 2d 64 |-type se|lected-d|
|00000620| 65 76 69 63 65 20 28 70 | 63 29 20 65 64 69 66 66 |evice (p|c) ediff|
|00000630| 2d 78 65 6d 61 63 73 2d | 70 20 28 74 74 79 20 70 |-xemacs-|p (tty p|
|00000640| 63 29 5d 20 32 5d 29 0a | 28 64 65 66 61 6c 69 61 |c)] 2]).|(defalia|
|00000650| 73 20 27 65 64 69 66 66 | 2d 64 65 66 76 61 72 2d |s 'ediff|-defvar-|
|00000660| 6c 6f 63 61 6c 20 27 28 | 6d 61 63 72 6f 20 2e 20 |local '(|macro . |
|00000670| 23 5b 28 76 61 72 20 76 | 61 6c 75 65 20 64 6f 63 |#[(var v|alue doc|
|00000680| 29 20 22 c0 c1 5c 6e 0b | 5c 66 46 c5 c6 5c 6e 44 |) "..\n.|\fF..\nD|
|00000690| 44 c7 c6 5c 6e 44 c8 42 | 42 46 87 22 20 5b 70 72 |D..\nD.B|BF." [pr|
|000006a0| 6f 67 6e 20 64 65 66 76 | 61 72 20 76 61 72 20 76 |ogn defv|ar var v|
|000006b0| 61 6c 75 65 20 64 6f 63 | 20 6d 61 6b 65 2d 76 61 |alue doc| make-va|
|000006c0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000006d0| 63 61 6c 20 71 75 6f 74 | 65 20 70 75 74 20 28 28 |cal quot|e put ((|
|000006e0| 71 75 6f 74 65 20 70 65 | 72 6d 61 6e 65 6e 74 2d |quote pe|rmanent-|
|000006f0| 6c 6f 63 61 6c 29 20 74 | 29 5d 20 36 5d 29 29 0a |local) t|)] 6])).|
|00000700| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00000710| 69 66 66 2d 62 75 66 66 | 65 72 2d 41 20 6e 69 6c |iff-buff|er-A nil|
|00000720| 20 28 23 24 20 2e 20 31 | 37 39 36 29 29 0a 28 62 | (#$ . 1|796)).(b|
|00000730| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00000740| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00000750| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00000760| 6c 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 41 |l ediff-|buffer-A|
|00000770| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00000780| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 32 20 1f |ocal t] |4).#@2 .|
|00000790| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 62 |.(defvar| ediff-b|
|000007a0| 75 66 66 65 72 2d 42 20 | 6e 69 6c 20 28 23 24 20 |uffer-B |nil (#$ |
|000007b0| 2e 20 31 39 33 35 29 29 | 0a 28 62 79 74 65 2d 63 |. 1935))|.(byte-c|
|000007c0| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|000007d0| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|000007e0| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|000007f0| 66 66 2d 62 75 66 66 65 | 72 2d 42 20 70 75 74 20 |ff-buffe|r-B put |
|00000800| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000810| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|00000820| 76 61 72 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |var edif|f-buffer|
|00000830| 2d 43 20 6e 69 6c 20 28 | 23 24 20 2e 20 32 30 37 |-C nil (|#$ . 207|
|00000840| 34 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |4)).(byt|e-code "|
|00000850| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00000860| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00000870| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 62 75 |r-local |ediff-bu|
|00000880| 66 66 65 72 2d 43 20 70 | 75 74 20 70 65 72 6d 61 |ffer-C p|ut perma|
|00000890| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|000008a0| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|000008b0| 64 69 66 66 2d 61 6e 63 | 65 73 74 6f 72 2d 62 75 |diff-anc|estor-bu|
|000008c0| 66 66 65 72 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |ffer nil| (#$ . 2|
|000008d0| 32 31 33 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |213)).(b|yte-code|
|000008e0| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|000008f0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00000900| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00000910| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|00000920| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00000930| 63 61 6c 20 74 5d 20 34 | 29 0a 23 40 32 20 1f 0a |cal t] 4|).#@2 ..|
|00000940| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 63 6f |(defvar |ediff-co|
|00000950| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 20 6e 69 6c |ntrol-bu|ffer nil|
|00000960| 20 28 23 24 20 2e 20 32 | 33 36 36 29 29 0a 28 62 | (#$ . 2|366)).(b|
|00000970| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00000980| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00000990| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000009a0| 6c 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |l ediff-|control-|
|000009b0| 62 75 66 66 65 72 20 70 | 75 74 20 70 65 72 6d 61 |buffer p|ut perma|
|000009c0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|000009d0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000009e0| 66 2d 6f 64 64 2d 70 20 | 27 28 6d 61 63 72 6f 20 |f-odd-p |'(macro |
|000009f0| 2e 20 23 5b 28 61 72 67 | 29 20 22 c0 c1 5c 6e c3 |. #[(arg|) "..\n.|
|00000a00| 42 42 c4 42 42 87 22 20 | 5b 65 71 20 6c 6f 67 61 |BB.BB." |[eq loga|
|00000a10| 6e 64 20 61 72 67 20 28 | 31 29 20 28 31 29 5d 20 |nd arg (|1) (1)] |
|00000a20| 34 5d 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |4])).(de|falias '|
|00000a30| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 6c 69 76 |ediff-bu|ffer-liv|
|00000a40| 65 2d 70 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |e-p '(ma|cro . #[|
|00000a50| 28 62 75 66 29 20 22 c0 | 09 c2 09 44 c3 c2 09 44 |(buf) ".|...D...D|
|00000a60| 44 46 87 22 20 5b 61 6e | 64 20 62 75 66 20 67 65 |DF." [an|d buf ge|
|00000a70| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00000a80| 6e 61 6d 65 5d 20 36 5d | 29 29 0a 28 64 65 66 61 |name] 6]|)).(defa|
|00000a90| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 67 65 74 2d |lias 'ed|iff-get-|
|00000aa0| 62 75 66 66 65 72 20 27 | 28 6d 61 63 72 6f 20 2e |buffer '|(macro .|
|00000ab0| 20 23 5b 28 61 72 67 29 | 20 22 c0 c1 5c 6e c3 42 | #[(arg)| "..\n.B|
|00000ac0| 42 c4 42 c1 5c 6e c5 42 | 42 c6 42 c1 5c 6e c7 42 |B.B.\n.B|B.B.\n.B|
|00000ad0| 42 c8 42 c1 5c 6e c9 42 | 42 ca 42 af 05 87 22 20 |B.B.\n.B|B.B..." |
|00000ae0| 5b 63 6f 6e 64 20 65 71 | 20 61 72 67 20 28 28 71 |[cond eq| arg ((q|
|00000af0| 75 6f 74 65 20 41 29 29 | 20 28 65 64 69 66 66 2d |uote A))| (ediff-|
|00000b00| 62 75 66 66 65 72 2d 41 | 29 20 28 28 71 75 6f 74 |buffer-A|) ((quot|
|00000b10| 65 20 42 29 29 20 28 65 | 64 69 66 66 2d 62 75 66 |e B)) (e|diff-buf|
|00000b20| 66 65 72 2d 42 29 20 28 | 28 71 75 6f 74 65 20 43 |fer-B) (|(quote C|
|00000b30| 29 29 20 28 65 64 69 66 | 66 2d 62 75 66 66 65 72 |)) (edif|f-buffer|
|00000b40| 2d 43 29 20 28 28 71 75 | 6f 74 65 20 41 6e 63 65 |-C) ((qu|ote Ance|
|00000b50| 73 74 6f 72 29 29 20 28 | 65 64 69 66 66 2d 61 6e |stor)) (|ediff-an|
|00000b60| 63 65 73 74 6f 72 2d 62 | 75 66 66 65 72 29 5d 20 |cestor-b|uffer)] |
|00000b70| 37 5d 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |7])).(de|falias '|
|00000b80| 65 64 69 66 66 2d 67 65 | 74 2d 76 61 6c 75 65 2d |ediff-ge|t-value-|
|00000b90| 61 63 63 6f 72 64 69 6e | 67 2d 74 6f 2d 62 75 66 |accordin|g-to-buf|
|00000ba0| 66 65 72 2d 74 79 70 65 | 20 27 28 6d 61 63 72 6f |fer-type| '(macro|
|00000bb0| 20 2e 20 23 5b 28 62 75 | 66 2d 74 79 70 65 20 6c | . #[(bu|f-type l|
|00000bc0| 69 73 74 29 20 22 c0 c1 | 5c 6e c3 42 42 c4 c5 0e |ist) "..|\n.BB...|
|00000bd0| 06 45 44 c1 5c 6e c7 42 | 42 c4 c8 0e 06 45 44 c1 |.ED.\n.B|B....ED.|
|00000be0| 5c 6e c9 42 42 c4 ca 0e | 06 45 44 46 87 22 20 5b |\n.BB...|.EDF." [|
|00000bf0| 63 6f 6e 64 20 65 71 20 | 62 75 66 2d 74 79 70 65 |cond eq |buf-type|
|00000c00| 20 28 28 71 75 6f 74 65 | 20 41 29 29 20 6e 74 68 | ((quote| A)) nth|
|00000c10| 20 30 20 6c 69 73 74 20 | 28 28 71 75 6f 74 65 20 | 0 list |((quote |
|00000c20| 42 29 29 20 31 20 28 28 | 71 75 6f 74 65 20 43 29 |B)) 1 ((|quote C)|
|00000c30| 29 20 32 5d 20 37 5d 29 | 29 0a 28 64 65 66 61 6c |) 2] 7])|).(defal|
|00000c40| 69 61 73 20 27 65 64 69 | 66 66 2d 63 68 61 72 2d |ias 'edi|ff-char-|
|00000c50| 74 6f 2d 62 75 66 74 79 | 70 65 20 27 28 6d 61 63 |to-bufty|pe '(mac|
|00000c60| 72 6f 20 2e 20 23 5b 28 | 61 72 67 29 20 22 c0 c1 |ro . #[(|arg) "..|
|00000c70| 5c 6e c3 42 42 c4 42 c1 | 5c 6e c5 42 42 c6 42 c1 |\n.BB.B.|\n.BB.B.|
|00000c80| 5c 6e c7 42 42 c8 42 46 | 87 22 20 5b 63 6f 6e 64 |\n.BB.BF|." [cond|
|00000c90| 20 6d 65 6d 71 20 61 72 | 67 20 28 28 71 75 6f 74 | memq ar|g ((quot|
|00000ca0| 65 20 28 39 37 20 36 35 | 29 29 29 20 28 28 71 75 |e (97 65|))) ((qu|
|00000cb0| 6f 74 65 20 41 29 29 20 | 28 28 71 75 6f 74 65 20 |ote A)) |((quote |
|00000cc0| 28 39 38 20 36 36 29 29 | 29 20 28 28 71 75 6f 74 |(98 66))|) ((quot|
|00000cd0| 65 20 42 29 29 20 28 28 | 71 75 6f 74 65 20 28 39 |e B)) ((|quote (9|
|00000ce0| 39 20 36 37 29 29 29 20 | 28 28 71 75 6f 74 65 20 |9 67))) |((quote |
|00000cf0| 43 29 29 5d 20 36 5d 29 | 29 0a 28 64 65 66 61 6c |C))] 6])|).(defal|
|00000d00| 69 61 73 20 27 65 64 69 | 66 66 2d 67 65 74 2d 64 |ias 'edi|ff-get-d|
|00000d10| 69 66 66 65 72 65 6e 63 | 65 20 27 28 6d 61 63 72 |ifferenc|e '(macr|
|00000d20| 6f 20 2e 20 23 5b 28 6e | 20 62 75 66 2d 74 79 70 |o . #[(n| buf-typ|
|00000d30| 65 29 20 22 c0 c1 c2 c3 | c4 0d 45 44 44 0e 06 45 |e) "....|..EDD..E|
|00000d40| 87 22 20 5b 61 72 65 66 | 20 73 79 6d 62 6f 6c 2d |." [aref| symbol-|
|00000d50| 76 61 6c 75 65 20 69 6e | 74 65 72 6e 20 66 6f 72 |value in|tern for|
|00000d60| 6d 61 74 20 22 65 64 69 | 66 66 2d 64 69 66 66 65 |mat "edi|ff-diffe|
|00000d70| 72 65 6e 63 65 2d 76 65 | 63 74 6f 72 2d 25 53 22 |rence-ve|ctor-%S"|
|00000d80| 20 62 75 66 2d 74 79 70 | 65 20 6e 5d 20 36 5d 29 | buf-typ|e n] 6])|
|00000d90| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00000da0| 66 66 2d 6e 6f 2d 66 69 | 6e 65 2d 64 69 66 66 73 |ff-no-fi|ne-diffs|
|00000db0| 2d 70 20 27 28 6d 61 63 | 72 6f 20 2e 20 23 5b 28 |-p '(mac|ro . #[(|
|00000dc0| 6e 29 20 22 c0 c1 5c 6e | c3 42 42 c4 42 42 87 22 |n) "..\n|.BB.BB."|
|00000dd0| 20 5b 61 72 65 66 20 65 | 64 69 66 66 2d 67 65 74 | [aref e|diff-get|
|00000de0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 6e 20 28 28 |-differe|nce n ((|
|00000df0| 71 75 6f 74 65 20 41 29 | 29 20 28 32 29 5d 20 34 |quote A)|) (2)] 4|
|00000e00| 5d 29 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |])).(def|alias 'e|
|00000e10| 64 69 66 66 2d 67 65 74 | 2d 64 69 66 66 2d 6f 76 |diff-get|-diff-ov|
|00000e20| 65 72 6c 61 79 2d 66 72 | 6f 6d 2d 64 69 66 66 2d |erlay-fr|om-diff-|
|00000e30| 72 65 63 6f 72 64 20 27 | 28 6d 61 63 72 6f 20 2e |record '|(macro .|
|00000e40| 20 23 5b 28 64 69 66 66 | 2d 72 65 63 29 20 22 c0 | #[(diff|-rec) ".|
|00000e50| 09 c2 42 42 87 22 20 5b | 61 72 65 66 20 64 69 66 |..BB." [|aref dif|
|00000e60| 66 2d 72 65 63 20 28 30 | 29 5d 20 33 5d 29 29 0a |f-rec (0|)] 3])).|
|00000e70| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00000e80| 2d 67 65 74 2d 64 69 66 | 66 2d 6f 76 65 72 6c 61 |-get-dif|f-overla|
|00000e90| 79 20 27 28 6d 61 63 72 | 6f 20 2e 20 23 5b 28 6e |y '(macr|o . #[(n|
|00000ea0| 20 62 75 66 2d 74 79 70 | 65 29 20 22 c0 c1 5c 6e | buf-typ|e) "..\n|
|00000eb0| 0b 45 44 87 22 20 5b 65 | 64 69 66 66 2d 67 65 74 |.ED." [e|diff-get|
|00000ec0| 2d 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 2d 66 72 |-diff-ov|erlay-fr|
|00000ed0| 6f 6d 2d 64 69 66 66 2d | 72 65 63 6f 72 64 20 65 |om-diff-|record e|
|00000ee0| 64 69 66 66 2d 67 65 74 | 2d 64 69 66 66 65 72 65 |diff-get|-differe|
|00000ef0| 6e 63 65 20 6e 20 62 75 | 66 2d 74 79 70 65 5d 20 |nce n bu|f-type] |
|00000f00| 34 5d 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |4])).(de|falias '|
|00000f10| 65 64 69 66 66 2d 67 65 | 74 2d 66 69 6e 65 2d 64 |ediff-ge|t-fine-d|
|00000f20| 69 66 66 2d 76 65 63 74 | 6f 72 2d 66 72 6f 6d 2d |iff-vect|or-from-|
|00000f30| 64 69 66 66 2d 72 65 63 | 6f 72 64 20 27 28 6d 61 |diff-rec|ord '(ma|
|00000f40| 63 72 6f 20 2e 20 23 5b | 28 64 69 66 66 2d 72 65 |cro . #[|(diff-re|
|00000f50| 63 29 20 22 c0 09 c2 42 | 42 87 22 20 5b 61 72 65 |c) "...B|B." [are|
|00000f60| 66 20 64 69 66 66 2d 72 | 65 63 20 28 31 29 5d 20 |f diff-r|ec (1)] |
|00000f70| 33 5d 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |3])).(de|falias '|
|00000f80| 65 64 69 66 66 2d 73 65 | 74 2d 66 69 6e 65 2d 64 |ediff-se|t-fine-d|
|00000f90| 69 66 66 2d 76 65 63 74 | 6f 72 20 27 28 6d 61 63 |iff-vect|or '(mac|
|00000fa0| 72 6f 20 2e 20 23 5b 28 | 6e 20 62 75 66 2d 74 79 |ro . #[(|n buf-ty|
|00000fb0| 70 65 20 66 69 6e 65 2d | 76 65 63 29 20 22 c0 c1 |pe fine-|vec) "..|
|00000fc0| 5c 6e 0b 45 c4 0d 46 87 | 22 20 5b 61 73 65 74 20 |\n.E..F.|" [aset |
|00000fd0| 65 64 69 66 66 2d 67 65 | 74 2d 64 69 66 66 65 72 |ediff-ge|t-differ|
|00000fe0| 65 6e 63 65 20 6e 20 62 | 75 66 2d 74 79 70 65 20 |ence n b|uf-type |
|00000ff0| 31 20 66 69 6e 65 2d 76 | 65 63 5d 20 34 5d 29 29 |1 fine-v|ec] 4]))|
|00001000| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001010| 66 2d 67 65 74 2d 73 74 | 61 74 65 2d 6f 66 2d 64 |f-get-st|ate-of-d|
|00001020| 69 66 66 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |iff '(ma|cro . #[|
|00001030| 28 6e 20 62 75 66 2d 74 | 79 70 65 29 20 22 c0 c1 |(n buf-t|ype) "..|
|00001040| c2 c3 5c 66 0d 45 c6 42 | 42 45 87 22 20 5b 69 66 |..\f.E.B|BE." [if|
|00001050| 20 28 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 6c | (ediff-|buffer-l|
|00001060| 69 76 65 2d 70 20 65 64 | 69 66 66 2d 62 75 66 66 |ive-p ed|iff-buff|
|00001070| 65 72 2d 43 29 20 61 72 | 65 66 20 65 64 69 66 66 |er-C) ar|ef ediff|
|00001080| 2d 67 65 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |-get-dif|ference |
|00001090| 6e 20 62 75 66 2d 74 79 | 70 65 20 28 33 29 5d 20 |n buf-ty|pe (3)] |
|000010a0| 36 5d 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |6])).(de|falias '|
|000010b0| 65 64 69 66 66 2d 73 65 | 74 2d 73 74 61 74 65 2d |ediff-se|t-state-|
|000010c0| 6f 66 2d 64 69 66 66 20 | 27 28 6d 61 63 72 6f 20 |of-diff |'(macro |
|000010d0| 2e 20 23 5b 28 6e 20 62 | 75 66 2d 74 79 70 65 20 |. #[(n b|uf-type |
|000010e0| 76 61 6c 29 20 22 c0 c1 | 5c 6e 0b 45 c4 0d 46 87 |val) "..|\n.E..F.|
|000010f0| 22 20 5b 61 73 65 74 20 | 65 64 69 66 66 2d 67 65 |" [aset |ediff-ge|
|00001100| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 6e 20 62 |t-differ|ence n b|
|00001110| 75 66 2d 74 79 70 65 20 | 33 20 76 61 6c 5d 20 34 |uf-type |3 val] 4|
|00001120| 5d 29 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |])).(def|alias 'e|
|00001130| 64 69 66 66 2d 67 65 74 | 2d 73 74 61 74 65 2d 6f |diff-get|-state-o|
|00001140| 66 2d 6d 65 72 67 65 20 | 27 28 6d 61 63 72 6f 20 |f-merge |'(macro |
|00001150| 2e 20 23 5b 28 6e 29 20 | 22 c0 c1 c2 89 c1 0b 45 |. #[(n) |"......E|
|00001160| c4 42 42 45 87 22 20 5b | 69 66 20 65 64 69 66 66 |.BBE." [|if ediff|
|00001170| 2d 73 74 61 74 65 2d 6f | 66 2d 6d 65 72 67 65 20 |-state-o|f-merge |
|00001180| 61 72 65 66 20 6e 20 28 | 30 29 5d 20 36 5d 29 29 |aref n (|0)] 6]))|
|00001190| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000011a0| 66 2d 67 65 74 2d 73 74 | 61 74 65 2d 6f 66 2d 61 |f-get-st|ate-of-a|
|000011b0| 6e 63 65 73 74 6f 72 20 | 27 28 6d 61 63 72 6f 20 |ncestor |'(macro |
|000011c0| 2e 20 23 5b 28 6e 29 20 | 22 c0 c1 c2 89 c1 0b 45 |. #[(n) |"......E|
|000011d0| c4 42 42 45 87 22 20 5b | 69 66 20 65 64 69 66 66 |.BBE." [|if ediff|
|000011e0| 2d 73 74 61 74 65 2d 6f | 66 2d 6d 65 72 67 65 20 |-state-o|f-merge |
|000011f0| 61 72 65 66 20 6e 20 28 | 31 29 5d 20 36 5d 29 29 |aref n (|1)] 6]))|
|00001200| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001210| 66 2d 73 65 74 2d 73 74 | 61 74 65 2d 6f 66 2d 6d |f-set-st|ate-of-m|
|00001220| 65 72 67 65 20 27 28 6d | 61 63 72 6f 20 2e 20 23 |erge '(m|acro . #|
|00001230| 5b 28 6e 20 76 61 6c 29 | 20 22 c0 c1 c2 c3 c1 5c |[(n val)| ".....\|
|00001240| 66 45 c5 0e 06 46 45 87 | 22 20 5b 69 66 20 65 64 |fE...FE.|" [if ed|
|00001250| 69 66 66 2d 73 74 61 74 | 65 2d 6f 66 2d 6d 65 72 |iff-stat|e-of-mer|
|00001260| 67 65 20 61 73 65 74 20 | 61 72 65 66 20 6e 20 30 |ge aset |aref n 0|
|00001270| 20 76 61 6c 5d 20 36 5d | 29 29 0a 28 64 65 66 61 | val] 6]|)).(defa|
|00001280| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 61 72 6b |lias 'ed|iff-mark|
|00001290| 2d 64 69 66 66 2d 61 73 | 2d 73 70 61 63 65 2d 6f |-diff-as|-space-o|
|000012a0| 6e 6c 79 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |nly '(ma|cro . #[|
|000012b0| 28 6e 20 66 6c 61 67 29 | 20 22 c0 c1 5c 6e c3 42 |(n flag)| "..\n.B|
|000012c0| 42 c4 0d 46 87 22 20 5b | 61 73 65 74 20 65 64 69 |B..F." [|aset edi|
|000012d0| 66 66 2d 67 65 74 2d 64 | 69 66 66 65 72 65 6e 63 |ff-get-d|ifferenc|
|000012e0| 65 20 6e 20 28 28 71 75 | 6f 74 65 20 41 29 29 20 |e n ((qu|ote A)) |
|000012f0| 32 20 66 6c 61 67 5d 20 | 34 5d 29 29 0a 28 64 65 |2 flag] |4])).(de|
|00001300| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 67 65 |falias '|ediff-ge|
|00001310| 74 2d 66 69 6e 65 2d 64 | 69 66 66 2d 76 65 63 74 |t-fine-d|iff-vect|
|00001320| 6f 72 20 27 28 6d 61 63 | 72 6f 20 2e 20 23 5b 28 |or '(mac|ro . #[(|
|00001330| 6e 20 62 75 66 2d 74 79 | 70 65 29 20 22 c0 c1 5c |n buf-ty|pe) "..\|
|00001340| 6e 0b 45 44 87 22 20 5b | 65 64 69 66 66 2d 67 65 |n.ED." [|ediff-ge|
|00001350| 74 2d 66 69 6e 65 2d 64 | 69 66 66 2d 76 65 63 74 |t-fine-d|iff-vect|
|00001360| 6f 72 2d 66 72 6f 6d 2d | 64 69 66 66 2d 72 65 63 |or-from-|diff-rec|
|00001370| 6f 72 64 20 65 64 69 66 | 66 2d 67 65 74 2d 64 69 |ord edif|f-get-di|
|00001380| 66 66 65 72 65 6e 63 65 | 20 6e 20 62 75 66 2d 74 |fference| n buf-t|
|00001390| 79 70 65 5d 20 34 5d 29 | 29 0a 28 64 65 66 61 6c |ype] 4])|).(defal|
|000013a0| 69 61 73 20 27 65 64 69 | 66 66 2d 65 76 61 6c 2d |ias 'edi|ff-eval-|
|000013b0| 69 6e 2d 62 75 66 66 65 | 72 20 27 28 6d 61 63 72 |in-buffe|r '(macr|
|000013c0| 6f 20 2e 20 23 5b 28 62 | 75 66 66 65 72 20 26 72 |o . #[(b|uffer &r|
|000013d0| 65 73 74 20 66 6f 72 6d | 73 29 20 22 c0 c1 c2 c3 |est form|s) "....|
|000013e0| 5c 66 44 c5 c6 c7 5c 66 | 44 0e 08 42 42 c9 42 42 |\fD...\f|D..BB.BB|
|000013f0| ca 42 42 42 45 87 22 20 | 5b 6c 65 74 20 28 28 53 |.BBBE." |[let ((S|
|00001400| 74 61 72 74 42 75 66 66 | 65 72 20 28 63 75 72 72 |tartBuff|er (curr|
|00001410| 65 6e 74 2d 62 75 66 66 | 65 72 29 29 29 20 69 66 |ent-buff|er))) if|
|00001420| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 6c 69 | ediff-b|uffer-li|
|00001430| 76 65 2d 70 20 62 75 66 | 66 65 72 20 75 6e 77 69 |ve-p buf|fer unwi|
|00001440| 6e 64 2d 70 72 6f 74 65 | 63 74 20 70 72 6f 67 6e |nd-prote|ct progn|
|00001450| 20 73 65 74 2d 62 75 66 | 66 65 72 20 66 6f 72 6d | set-buf|fer form|
|00001460| 73 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |s ((set-|buffer S|
|00001470| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 28 28 6f |tartBuff|er)) ((o|
|00001480| 72 20 28 65 71 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |r (eq th|is-comma|
|00001490| 6e 64 20 28 71 75 6f 74 | 65 20 65 64 69 66 66 2d |nd (quot|e ediff-|
|000014a0| 71 75 69 74 29 29 20 28 | 65 72 72 6f 72 20 65 64 |quit)) (|error ed|
|000014b0| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|000014c0| 2d 42 55 46 46 45 52 29 | 29 29 5d 20 38 5d 29 29 |-BUFFER)|))] 8]))|
|000014d0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000014e0| 66 2d 6d 75 6c 74 69 66 | 72 61 6d 65 2d 73 65 74 |f-multif|rame-set|
|000014f0| 75 70 2d 70 20 23 5b 6e | 69 6c 20 22 c0 20 85 06 |up-p #[n|il ". ..|
|00001500| 00 09 87 22 20 5b 65 64 | 69 66 66 2d 77 69 6e 64 |..." [ed|iff-wind|
|00001510| 6f 77 2d 64 69 73 70 6c | 61 79 2d 70 20 65 64 69 |ow-displ|ay-p edi|
|00001520| 66 66 2d 6d 75 6c 74 69 | 66 72 61 6d 65 5d 20 31 |ff-multi|frame] 1|
|00001530| 5d 29 0a 28 70 75 74 20 | 28 71 75 6f 74 65 20 65 |]).(put |(quote e|
|00001540| 64 69 66 66 2d 6d 75 6c | 74 69 66 72 61 6d 65 2d |diff-mul|tiframe-|
|00001550| 73 65 74 75 70 2d 70 29 | 20 28 71 75 6f 74 65 20 |setup-p)| (quote |
|00001560| 62 79 74 65 2d 6f 70 74 | 69 6d 69 7a 65 72 29 20 |byte-opt|imizer) |
|00001570| 28 71 75 6f 74 65 20 62 | 79 74 65 2d 63 6f 6d 70 |(quote b|yte-comp|
|00001580| 69 6c 65 2d 69 6e 6c 69 | 6e 65 2d 65 78 70 61 6e |ile-inli|ne-expan|
|00001590| 64 29 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |d)).(def|alias 'e|
|000015a0| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 63 6f 6e 74 |diff-nar|row-cont|
|000015b0| 72 6f 6c 2d 66 72 61 6d | 65 2d 70 20 27 28 6d 61 |rol-fram|e-p '(ma|
|000015c0| 63 72 6f 20 2e 20 23 5b | 6e 69 6c 20 22 c0 87 22 |cro . #[|nil ".."|
|000015d0| 20 5b 28 61 6e 64 20 28 | 65 64 69 66 66 2d 6d 75 | [(and (|ediff-mu|
|000015e0| 6c 74 69 66 72 61 6d 65 | 2d 73 65 74 75 70 2d 70 |ltiframe|-setup-p|
|000015f0| 29 20 28 65 71 75 61 6c | 20 65 64 69 66 66 2d 68 |) (equal| ediff-h|
|00001600| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 65 64 69 66 |elp-mess|age edif|
|00001610| 66 2d 62 72 69 65 66 2d | 6d 65 73 73 61 67 65 2d |f-brief-|message-|
|00001620| 73 74 72 69 6e 67 29 29 | 5d 20 31 5d 29 29 0a 28 |string))|] 1])).(|
|00001630| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00001640| 33 77 61 79 2d 63 6f 6d | 70 61 72 69 73 6f 6e 2d |3way-com|parison-|
|00001650| 6a 6f 62 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |job '(ma|cro . #[|
|00001660| 6e 69 6c 20 22 c0 87 22 | 20 5b 28 6d 65 6d 71 20 |nil ".."| [(memq |
|00001670| 65 64 69 66 66 2d 6a 6f | 62 2d 6e 61 6d 65 20 28 |ediff-jo|b-name (|
|00001680| 71 75 6f 74 65 20 28 65 | 64 69 66 66 2d 66 69 6c |quote (e|diff-fil|
|00001690| 65 73 33 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |es3 edif|f-buffer|
|000016a0| 73 33 29 29 29 5d 20 31 | 5d 29 29 0a 23 40 32 20 |s3)))] 1|])).#@2 |
|000016b0| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|000016c0| 33 77 61 79 2d 63 6f 6d | 70 61 72 69 73 6f 6e 2d |3way-com|parison-|
|000016d0| 6a 6f 62 20 6e 69 6c 20 | 28 23 24 20 2e 20 35 38 |job nil |(#$ . 58|
|000016e0| 30 38 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |08)).(by|te-code |
|000016f0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00001700| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00001710| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 33 |er-local| ediff-3|
|00001720| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 2d 6a |way-comp|arison-j|
|00001730| 6f 62 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |ob put p|ermanent|
|00001740| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 28 64 65 |-local t|] 4).(de|
|00001750| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 6d 65 |falias '|ediff-me|
|00001760| 72 67 65 2d 6a 6f 62 20 | 27 28 6d 61 63 72 6f 20 |rge-job |'(macro |
|00001770| 2e 20 23 5b 6e 69 6c 20 | 22 c0 87 22 20 5b 28 6d |. #[nil |".." [(m|
|00001780| 65 6d 71 20 65 64 69 66 | 66 2d 6a 6f 62 2d 6e 61 |emq edif|f-job-na|
|00001790| 6d 65 20 28 71 75 6f 74 | 65 20 28 65 64 69 66 66 |me (quot|e (ediff|
|000017a0| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 73 20 65 64 69 |-merge-f|iles edi|
|000017b0| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|000017c0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 66 69 6c | ediff-m|erge-fil|
|000017d0| 65 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |es-with-|ancestor|
|000017e0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 62 75 66 | ediff-m|erge-buf|
|000017f0| 66 65 72 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |fers-wit|h-ancest|
|00001800| 6f 72 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 72 |or ediff|-merge-r|
|00001810| 65 76 69 73 69 6f 6e 73 | 20 65 64 69 66 66 2d 6d |evisions| ediff-m|
|00001820| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |erge-rev|isions-w|
|00001830| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 29 29 5d |ith-ance|stor)))]|
|00001840| 20 31 5d 29 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 | 1])).#@|2 ..(def|
|00001850| 76 61 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |var edif|f-merge-|
|00001860| 6a 6f 62 20 6e 69 6c 20 | 28 23 24 20 2e 20 36 32 |job nil |(#$ . 62|
|00001870| 31 38 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |18)).(by|te-code |
|00001880| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00001890| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000018a0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6d |er-local| ediff-m|
|000018b0| 65 72 67 65 2d 6a 6f 62 | 20 70 75 74 20 70 65 72 |erge-job| put per|
|000018c0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|000018d0| 34 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |4).(defa|lias 'ed|
|000018e0| 69 66 66 2d 6d 65 72 67 | 65 2d 77 69 74 68 2d 61 |iff-merg|e-with-a|
|000018f0| 6e 63 65 73 74 6f 72 2d | 6a 6f 62 20 27 28 6d 61 |ncestor-|job '(ma|
|00001900| 63 72 6f 20 2e 20 23 5b | 6e 69 6c 20 22 c0 87 22 |cro . #[|nil ".."|
|00001910| 20 5b 28 6d 65 6d 71 20 | 65 64 69 66 66 2d 6a 6f | [(memq |ediff-jo|
|00001920| 62 2d 6e 61 6d 65 20 28 | 71 75 6f 74 65 20 28 65 |b-name (|quote (e|
|00001930| 64 69 66 66 2d 6d 65 72 | 67 65 2d 66 69 6c 65 73 |diff-mer|ge-files|
|00001940| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 65 |-with-an|cestor e|
|00001950| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|00001960| 72 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |rs-with-|ancestor|
|00001970| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 72 65 76 | ediff-m|erge-rev|
|00001980| 69 73 69 6f 6e 73 2d 77 | 69 74 68 2d 61 6e 63 65 |isions-w|ith-ance|
|00001990| 73 74 6f 72 29 29 29 5d | 20 31 5d 29 29 0a 23 40 |stor)))]| 1])).#@|
|000019a0| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|000019b0| 66 2d 6d 65 72 67 65 2d | 77 69 74 68 2d 61 6e 63 |f-merge-|with-anc|
|000019c0| 65 73 74 6f 72 2d 6a 6f | 62 20 6e 69 6c 20 28 23 |estor-jo|b nil (#|
|000019d0| 24 20 2e 20 36 35 36 32 | 29 29 0a 28 62 79 74 65 |$ . 6562|)).(byte|
|000019e0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000019f0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00001a00| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00001a10| 64 69 66 66 2d 6d 65 72 | 67 65 2d 77 69 74 68 2d |diff-mer|ge-with-|
|00001a20| 61 6e 63 65 73 74 6f 72 | 2d 6a 6f 62 20 70 75 74 |ancestor|-job put|
|00001a30| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00001a40| 20 74 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 | t] 4).(|defalias|
|00001a50| 20 27 65 64 69 66 66 2d | 33 77 61 79 2d 6a 6f 62 | 'ediff-|3way-job|
|00001a60| 20 27 28 6d 61 63 72 6f | 20 2e 20 23 5b 6e 69 6c | '(macro| . #[nil|
|00001a70| 20 22 c0 87 22 20 5b 28 | 6f 72 20 65 64 69 66 66 | ".." [(|or ediff|
|00001a80| 2d 33 77 61 79 2d 63 6f | 6d 70 61 72 69 73 6f 6e |-3way-co|mparison|
|00001a90| 2d 6a 6f 62 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |-job edi|ff-merge|
|00001aa0| 2d 6a 6f 62 29 5d 20 31 | 5d 29 29 0a 23 40 32 20 |-job)] 1|])).#@2 |
|00001ab0| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00001ac0| 33 77 61 79 2d 6a 6f 62 | 20 6e 69 6c 20 28 23 24 |3way-job| nil (#$|
|00001ad0| 20 2e 20 36 38 33 32 29 | 29 0a 28 62 79 74 65 2d | . 6832)|).(byte-|
|00001ae0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00001af0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00001b00| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00001b10| 69 66 66 2d 33 77 61 79 | 2d 6a 6f 62 20 70 75 74 |iff-3way|-job put|
|00001b20| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00001b30| 20 74 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 | t] 4).(|defalias|
|00001b40| 20 27 65 64 69 66 66 2d | 64 69 66 66 33 2d 6a 6f | 'ediff-|diff3-jo|
|00001b50| 62 20 27 28 6d 61 63 72 | 6f 20 2e 20 23 5b 6e 69 |b '(macr|o . #[ni|
|00001b60| 6c 20 22 c0 87 22 20 5b | 28 6f 72 20 65 64 69 66 |l ".." [|(or edif|
|00001b70| 66 2d 33 77 61 79 2d 63 | 6f 6d 70 61 72 69 73 6f |f-3way-c|ompariso|
|00001b80| 6e 2d 6a 6f 62 20 65 64 | 69 66 66 2d 6d 65 72 67 |n-job ed|iff-merg|
|00001b90| 65 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 2d |e-with-a|ncestor-|
|00001ba0| 6a 6f 62 29 5d 20 31 5d | 29 29 0a 23 40 32 20 1f |job)] 1]|)).#@2 .|
|00001bb0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 64 |.(defvar| ediff-d|
|00001bc0| 69 66 66 33 2d 6a 6f 62 | 20 6e 69 6c 20 28 23 24 |iff3-job| nil (#$|
|00001bd0| 20 2e 20 37 30 38 37 29 | 29 0a 28 62 79 74 65 2d | . 7087)|).(byte-|
|00001be0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00001bf0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00001c00| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00001c10| 69 66 66 2d 64 69 66 66 | 33 2d 6a 6f 62 20 70 75 |iff-diff|3-job pu|
|00001c20| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00001c30| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 61 6c 69 61 |l t] 4).|(defalia|
|00001c40| 73 20 27 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 |s 'ediff|-windows|
|00001c50| 2d 6a 6f 62 20 27 28 6d | 61 63 72 6f 20 2e 20 23 |-job '(m|acro . #|
|00001c60| 5b 6e 69 6c 20 22 c0 87 | 22 20 5b 28 6d 65 6d 71 |[nil "..|" [(memq|
|00001c70| 20 65 64 69 66 66 2d 6a | 6f 62 2d 6e 61 6d 65 20 | ediff-j|ob-name |
|00001c80| 28 71 75 6f 74 65 20 28 | 65 64 69 66 66 2d 77 69 |(quote (|ediff-wi|
|00001c90| 6e 64 6f 77 73 2d 77 6f | 72 64 77 69 73 65 20 65 |ndows-wo|rdwise e|
|00001ca0| 64 69 66 66 2d 77 69 6e | 64 6f 77 73 2d 6c 69 6e |diff-win|dows-lin|
|00001cb0| 65 77 69 73 65 29 29 29 | 5d 20 31 5d 29 29 0a 23 |ewise)))|] 1])).#|
|00001cc0| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00001cd0| 66 66 2d 77 69 6e 64 6f | 77 73 2d 6a 6f 62 20 6e |ff-windo|ws-job n|
|00001ce0| 69 6c 20 28 23 24 20 2e | 20 37 33 36 33 29 29 0a |il (#$ .| 7363)).|
|00001cf0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00001d00| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00001d10| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00001d20| 63 61 6c 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |cal edif|f-window|
|00001d30| 73 2d 6a 6f 62 20 70 75 | 74 20 70 65 72 6d 61 6e |s-job pu|t perman|
|00001d40| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00001d50| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00001d60| 2d 77 6f 72 64 2d 6d 6f | 64 65 2d 6a 6f 62 20 27 |-word-mo|de-job '|
|00001d70| 28 6d 61 63 72 6f 20 2e | 20 23 5b 6e 69 6c 20 22 |(macro .| #[nil "|
|00001d80| c0 87 22 20 5b 28 6d 65 | 6d 71 20 65 64 69 66 66 |.." [(me|mq ediff|
|00001d90| 2d 6a 6f 62 2d 6e 61 6d | 65 20 28 71 75 6f 74 65 |-job-nam|e (quote|
|00001da0| 20 28 65 64 69 66 66 2d | 77 69 6e 64 6f 77 73 2d | (ediff-|windows-|
|00001db0| 77 6f 72 64 77 69 73 65 | 20 65 64 69 66 66 2d 72 |wordwise| ediff-r|
|00001dc0| 65 67 69 6f 6e 73 2d 77 | 6f 72 64 77 69 73 65 29 |egions-w|ordwise)|
|00001dd0| 29 29 5d 20 31 5d 29 29 | 0a 23 40 32 20 1f 0a 28 |))] 1]))|.#@2 ..(|
|00001de0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 77 6f 72 |defvar e|diff-wor|
|00001df0| 64 2d 6d 6f 64 65 2d 6a | 6f 62 20 6e 69 6c 20 28 |d-mode-j|ob nil (|
|00001e00| 23 24 20 2e 20 37 36 34 | 35 29 29 0a 28 62 79 74 |#$ . 764|5)).(byt|
|00001e10| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00001e20| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00001e30| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00001e40| 65 64 69 66 66 2d 77 6f | 72 64 2d 6d 6f 64 65 2d |ediff-wo|rd-mode-|
|00001e50| 6a 6f 62 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |job put |permanen|
|00001e60| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00001e70| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 6e |efalias |'ediff-n|
|00001e80| 61 72 72 6f 77 2d 6a 6f | 62 20 27 28 6d 61 63 72 |arrow-jo|b '(macr|
|00001e90| 6f 20 2e 20 23 5b 6e 69 | 6c 20 22 c0 87 22 20 5b |o . #[ni|l ".." [|
|00001ea0| 28 6d 65 6d 71 20 65 64 | 69 66 66 2d 6a 6f 62 2d |(memq ed|iff-job-|
|00001eb0| 6e 61 6d 65 20 28 71 75 | 6f 74 65 20 28 65 64 69 |name (qu|ote (edi|
|00001ec0| 66 66 2d 77 69 6e 64 6f | 77 73 2d 77 6f 72 64 77 |ff-windo|ws-wordw|
|00001ed0| 69 73 65 20 65 64 69 66 | 66 2d 72 65 67 69 6f 6e |ise edif|f-region|
|00001ee0| 73 2d 77 6f 72 64 77 69 | 73 65 20 65 64 69 66 66 |s-wordwi|se ediff|
|00001ef0| 2d 77 69 6e 64 6f 77 73 | 2d 6c 69 6e 65 77 69 73 |-windows|-linewis|
|00001f00| 65 20 65 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d |e ediff-|regions-|
|00001f10| 6c 69 6e 65 77 69 73 65 | 29 29 29 5d 20 31 5d 29 |linewise|)))] 1])|
|00001f20| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00001f30| 65 64 69 66 66 2d 6e 61 | 72 72 6f 77 2d 6a 6f 62 |ediff-na|rrow-job|
|00001f40| 20 6e 69 6c 20 28 23 24 | 20 2e 20 37 39 37 34 29 | nil (#$| . 7974)|
|00001f50| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00001f60| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00001f70| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00001f80| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 6e 61 72 72 |local ed|iff-narr|
|00001f90| 6f 77 2d 6a 6f 62 20 70 | 75 74 20 70 65 72 6d 61 |ow-job p|ut perma|
|00001fa0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00001fb0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001fc0| 66 2d 61 6e 63 65 73 74 | 6f 72 2d 6d 65 74 61 6a |f-ancest|or-metaj|
|00001fd0| 6f 62 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |ob #[(&o|ptional |
|00001fe0| 6d 65 74 61 6a 6f 62 29 | 20 22 08 86 05 00 09 c2 |metajob)| "......|
|00001ff0| 3e 87 22 20 5b 6d 65 74 | 61 6a 6f 62 20 65 64 69 |>." [met|ajob edi|
|00002000| 66 66 2d 6d 65 74 61 6a | 6f 62 2d 6e 61 6d 65 20 |ff-metaj|ob-name |
|00002010| 28 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |(ediff-m|erge-dir|
|00002020| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|00002030| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|00002040| 67 65 2d 66 69 6c 65 67 | 72 6f 75 70 73 2d 77 69 |ge-fileg|roups-wi|
|00002050| 74 68 2d 61 6e 63 65 73 | 74 6f 72 29 5d 20 32 5d |th-ances|tor)] 2]|
|00002060| 29 0a 28 70 75 74 20 28 | 71 75 6f 74 65 20 65 64 |).(put (|quote ed|
|00002070| 69 66 66 2d 61 6e 63 65 | 73 74 6f 72 2d 6d 65 74 |iff-ance|stor-met|
|00002080| 61 6a 6f 62 29 20 28 71 | 75 6f 74 65 20 62 79 74 |ajob) (q|uote byt|
|00002090| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 29 20 28 71 75 |e-optimi|zer) (qu|
|000020a0| 6f 74 65 20 62 79 74 65 | 2d 63 6f 6d 70 69 6c 65 |ote byte|-compile|
|000020b0| 2d 69 6e 6c 69 6e 65 2d | 65 78 70 61 6e 64 29 29 |-inline-|expand))|
|000020c0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000020d0| 66 2d 72 65 76 69 73 69 | 6f 6e 2d 6d 65 74 61 6a |f-revisi|on-metaj|
|000020e0| 6f 62 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |ob #[(&o|ptional |
|000020f0| 6d 65 74 61 6a 6f 62 29 | 20 22 08 86 05 00 09 c2 |metajob)| "......|
|00002100| 3e 87 22 20 5b 6d 65 74 | 61 6a 6f 62 20 65 64 69 |>." [met|ajob edi|
|00002110| 66 66 2d 6d 65 74 61 6a | 6f 62 2d 6e 61 6d 65 20 |ff-metaj|ob-name |
|00002120| 28 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 79 |(ediff-d|irectory|
|00002130| 2d 72 65 76 69 73 69 6f | 6e 73 20 65 64 69 66 66 |-revisio|ns ediff|
|00002140| 2d 6d 65 72 67 65 2d 64 | 69 72 65 63 74 6f 72 79 |-merge-d|irectory|
|00002150| 2d 72 65 76 69 73 69 6f | 6e 73 20 65 64 69 66 66 |-revisio|ns ediff|
|00002160| 2d 6d 65 72 67 65 2d 64 | 69 72 65 63 74 6f 72 79 |-merge-d|irectory|
|00002170| 2d 72 65 76 69 73 69 6f | 6e 73 2d 77 69 74 68 2d |-revisio|ns-with-|
|00002180| 61 6e 63 65 73 74 6f 72 | 29 5d 20 32 5d 29 0a 28 |ancestor|)] 2]).(|
|00002190| 70 75 74 20 28 71 75 6f | 74 65 20 65 64 69 66 66 |put (quo|te ediff|
|000021a0| 2d 72 65 76 69 73 69 6f | 6e 2d 6d 65 74 61 6a 6f |-revisio|n-metajo|
|000021b0| 62 29 20 28 71 75 6f 74 | 65 20 62 79 74 65 2d 6f |b) (quot|e byte-o|
|000021c0| 70 74 69 6d 69 7a 65 72 | 29 20 28 71 75 6f 74 65 |ptimizer|) (quote|
|000021d0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|000021e0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 29 0a 28 64 |line-exp|and)).(d|
|000021f0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 70 |efalias |'ediff-p|
|00002200| 61 74 63 68 2d 6d 65 74 | 61 6a 6f 62 20 23 5b 28 |atch-met|ajob #[(|
|00002210| 26 6f 70 74 69 6f 6e 61 | 6c 20 6d 65 74 61 6a 6f |&optiona|l metajo|
|00002220| 62 29 20 22 08 86 05 00 | 09 c2 3e 87 22 20 5b 6d |b) "....|..>." [m|
|00002230| 65 74 61 6a 6f 62 20 65 | 64 69 66 66 2d 6d 65 74 |etajob e|diff-met|
|00002240| 61 6a 6f 62 2d 6e 61 6d | 65 20 28 65 64 69 66 66 |ajob-nam|e (ediff|
|00002250| 2d 6d 75 6c 74 69 66 69 | 6c 65 2d 70 61 74 63 68 |-multifi|le-patch|
|00002260| 29 5d 20 32 5d 29 0a 28 | 70 75 74 20 28 71 75 6f |)] 2]).(|put (quo|
|00002270| 74 65 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 6d |te ediff|-patch-m|
|00002280| 65 74 61 6a 6f 62 29 20 | 28 71 75 6f 74 65 20 62 |etajob) |(quote b|
|00002290| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 29 20 28 |yte-opti|mizer) (|
|000022a0| 71 75 6f 74 65 20 62 79 | 74 65 2d 63 6f 6d 70 69 |quote by|te-compi|
|000022b0| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|000022c0| 29 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |)).(defa|lias 'ed|
|000022d0| 69 66 66 2d 6f 6e 65 2d | 66 69 6c 65 67 72 6f 75 |iff-one-|filegrou|
|000022e0| 70 2d 6d 65 74 61 6a 6f | 62 20 23 5b 28 26 6f 70 |p-metajo|b #[(&op|
|000022f0| 74 69 6f 6e 61 6c 20 6d | 65 74 61 6a 6f 62 29 20 |tional m|etajob) |
|00002300| 22 08 89 18 86 07 00 09 | c2 3e 29 86 17 00 08 89 |".......|.>).....|
|00002310| 18 86 14 00 09 c3 3e 29 | 87 22 20 5b 6d 65 74 61 |......>)|." [meta|
|00002320| 6a 6f 62 20 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |job edif|f-metajo|
|00002330| 62 2d 6e 61 6d 65 20 28 | 65 64 69 66 66 2d 64 69 |b-name (|ediff-di|
|00002340| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00002350| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |s ediff-|merge-di|
|00002360| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00002370| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |s ediff-|merge-di|
|00002380| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00002390| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 29 |s-with-a|ncestor)|
|000023a0| 20 28 65 64 69 66 66 2d | 6d 75 6c 74 69 66 69 6c | (ediff-|multifil|
|000023b0| 65 2d 70 61 74 63 68 29 | 5d 20 33 5d 29 0a 28 70 |e-patch)|] 3]).(p|
|000023c0| 75 74 20 28 71 75 6f 74 | 65 20 65 64 69 66 66 2d |ut (quot|e ediff-|
|000023d0| 6f 6e 65 2d 66 69 6c 65 | 67 72 6f 75 70 2d 6d 65 |one-file|group-me|
|000023e0| 74 61 6a 6f 62 29 20 28 | 71 75 6f 74 65 20 62 79 |tajob) (|quote by|
|000023f0| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 29 20 28 71 |te-optim|izer) (q|
|00002400| 75 6f 74 65 20 62 79 74 | 65 2d 63 6f 6d 70 69 6c |uote byt|e-compil|
|00002410| 65 2d 69 6e 6c 69 6e 65 | 2d 65 78 70 61 6e 64 29 |e-inline|-expand)|
|00002420| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00002430| 66 66 2d 63 6f 6c 6c 65 | 63 74 2d 64 69 66 66 73 |ff-colle|ct-diffs|
|00002440| 2d 6d 65 74 61 6a 6f 62 | 20 23 5b 28 26 6f 70 74 |-metajob| #[(&opt|
|00002450| 69 6f 6e 61 6c 20 6d 65 | 74 61 6a 6f 62 29 20 22 |ional me|tajob) "|
|00002460| 08 86 05 00 09 c2 3e 87 | 22 20 5b 6d 65 74 61 6a |......>.|" [metaj|
|00002470| 6f 62 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |ob ediff|-metajob|
|00002480| 2d 6e 61 6d 65 20 28 65 | 64 69 66 66 2d 64 69 72 |-name (e|diff-dir|
|00002490| 65 63 74 6f 72 69 65 73 | 20 65 64 69 66 66 2d 64 |ectories| ediff-d|
|000024a0| 69 72 65 63 74 6f 72 79 | 2d 72 65 76 69 73 69 6f |irectory|-revisio|
|000024b0| 6e 73 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 |ns ediff|-merge-d|
|000024c0| 69 72 65 63 74 6f 72 69 | 65 73 20 65 64 69 66 66 |irectori|es ediff|
|000024d0| 2d 6d 65 72 67 65 2d 64 | 69 72 65 63 74 6f 72 69 |-merge-d|irectori|
|000024e0| 65 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |es-with-|ancestor|
|000024f0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 | ediff-m|erge-dir|
|00002500| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|00002510| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 | ediff-m|erge-dir|
|00002520| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|00002530| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 5d |-with-an|cestor)]|
|00002540| 20 32 5d 29 0a 28 70 75 | 74 20 28 71 75 6f 74 65 | 2]).(pu|t (quote|
|00002550| 20 65 64 69 66 66 2d 63 | 6f 6c 6c 65 63 74 2d 64 | ediff-c|ollect-d|
|00002560| 69 66 66 73 2d 6d 65 74 | 61 6a 6f 62 29 20 28 71 |iffs-met|ajob) (q|
|00002570| 75 6f 74 65 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |uote byt|e-optimi|
|00002580| 7a 65 72 29 20 28 71 75 | 6f 74 65 20 62 79 74 65 |zer) (qu|ote byte|
|00002590| 2d 63 6f 6d 70 69 6c 65 | 2d 69 6e 6c 69 6e 65 2d |-compile|-inline-|
|000025a0| 65 78 70 61 6e 64 29 29 | 0a 28 64 65 66 61 6c 69 |expand))|.(defali|
|000025b0| 61 73 20 27 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |as 'edif|f-metajo|
|000025c0| 62 33 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |b3 #[(&o|ptional |
|000025d0| 6d 65 74 61 6a 6f 62 29 | 20 22 08 86 05 00 09 c2 |metajob)| "......|
|000025e0| 3e 87 22 20 5b 6d 65 74 | 61 6a 6f 62 20 65 64 69 |>." [met|ajob edi|
|000025f0| 66 66 2d 6d 65 74 61 6a | 6f 62 2d 6e 61 6d 65 20 |ff-metaj|ob-name |
|00002600| 28 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |(ediff-m|erge-dir|
|00002610| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|00002620| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|00002630| 67 65 2d 66 69 6c 65 67 | 72 6f 75 70 73 2d 77 69 |ge-fileg|roups-wi|
|00002640| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00002650| 66 2d 64 69 72 65 63 74 | 6f 72 69 65 73 33 20 65 |f-direct|ories3 e|
|00002660| 64 69 66 66 2d 66 69 6c | 65 67 72 6f 75 70 73 33 |diff-fil|egroups3|
|00002670| 29 5d 20 32 5d 29 0a 28 | 70 75 74 20 28 71 75 6f |)] 2]).(|put (quo|
|00002680| 74 65 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |te ediff|-metajob|
|00002690| 33 29 20 28 71 75 6f 74 | 65 20 62 79 74 65 2d 6f |3) (quot|e byte-o|
|000026a0| 70 74 69 6d 69 7a 65 72 | 29 20 28 71 75 6f 74 65 |ptimizer|) (quote|
|000026b0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|000026c0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 29 0a 28 64 |line-exp|and)).(d|
|000026d0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 63 |efalias |'ediff-c|
|000026e0| 6f 6d 70 61 72 69 73 6f | 6e 2d 6d 65 74 61 6a 6f |ompariso|n-metajo|
|000026f0| 62 33 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |b3 #[(&o|ptional |
|00002700| 6d 65 74 61 6a 6f 62 29 | 20 22 08 86 05 00 09 c2 |metajob)| "......|
|00002710| 3e 87 22 20 5b 6d 65 74 | 61 6a 6f 62 20 65 64 69 |>." [met|ajob edi|
|00002720| 66 66 2d 6d 65 74 61 6a | 6f 62 2d 6e 61 6d 65 20 |ff-metaj|ob-name |
|00002730| 28 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 |(ediff-d|irectori|
|00002740| 65 73 33 20 65 64 69 66 | 66 2d 66 69 6c 65 67 72 |es3 edif|f-filegr|
|00002750| 6f 75 70 73 33 29 5d 20 | 32 5d 29 0a 28 70 75 74 |oups3)] |2]).(put|
|00002760| 20 28 71 75 6f 74 65 20 | 65 64 69 66 66 2d 63 6f | (quote |ediff-co|
|00002770| 6d 70 61 72 69 73 6f 6e | 2d 6d 65 74 61 6a 6f 62 |mparison|-metajob|
|00002780| 33 29 20 28 71 75 6f 74 | 65 20 62 79 74 65 2d 6f |3) (quot|e byte-o|
|00002790| 70 74 69 6d 69 7a 65 72 | 29 20 28 71 75 6f 74 65 |ptimizer|) (quote|
|000027a0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|000027b0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 29 0a 28 64 |line-exp|and)).(d|
|000027c0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 62 |efalias |'ediff-b|
|000027d0| 61 72 66 2d 69 66 2d 6e | 6f 74 2d 63 6f 6e 74 72 |arf-if-n|ot-contr|
|000027e0| 6f 6c 2d 62 75 66 66 65 | 72 20 23 5b 28 26 6f 70 |ol-buffe|r #[(&op|
|000027f0| 74 69 6f 6e 61 6c 20 6d | 65 74 61 2d 62 75 66 29 |tional m|eta-buf)|
|00002800| 20 22 08 83 08 00 09 82 | 09 00 5c 6e 70 3d 86 12 | "......|..\np=..|
|00002810| 00 c3 c4 0d 5c 22 87 22 | 20 5b 6d 65 74 61 2d 62 |....\"."| [meta-b|
|00002820| 75 66 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 62 75 |uf ediff|-meta-bu|
|00002830| 66 66 65 72 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |ffer edi|ff-contr|
|00002840| 6f 6c 2d 62 75 66 66 65 | 72 20 65 72 72 6f 72 20 |ol-buffe|r error |
|00002850| 22 25 53 3a 20 54 68 69 | 73 20 63 6f 6d 6d 61 6e |"%S: Thi|s comman|
|00002860| 64 20 72 75 6e 73 20 69 | 6e 20 45 64 69 66 66 20 |d runs i|n Ediff |
|00002870| 43 6f 6e 74 72 6f 6c 20 | 42 75 66 66 65 72 20 6f |Control |Buffer o|
|00002880| 6e 6c 79 21 22 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |nly!" th|is-comma|
|00002890| 6e 64 5d 20 33 5d 29 0a | 28 70 75 74 20 28 71 75 |nd] 3]).|(put (qu|
|000028a0| 6f 74 65 20 65 64 69 66 | 66 2d 62 61 72 66 2d 69 |ote edif|f-barf-i|
|000028b0| 66 2d 6e 6f 74 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |f-not-co|ntrol-bu|
|000028c0| 66 66 65 72 29 20 28 71 | 75 6f 74 65 20 62 79 74 |ffer) (q|uote byt|
|000028d0| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 29 20 28 71 75 |e-optimi|zer) (qu|
|000028e0| 6f 74 65 20 62 79 74 65 | 2d 63 6f 6d 70 69 6c 65 |ote byte|-compile|
|000028f0| 2d 69 6e 6c 69 6e 65 2d | 65 78 70 61 6e 64 29 29 |-inline-|expand))|
|00002900| 0a 23 40 31 36 37 20 2a | 48 6f 6f 6b 73 20 74 6f |.#@167 *|Hooks to|
|00002910| 20 72 75 6e 20 62 65 66 | 6f 72 65 20 45 64 69 66 | run bef|ore Edif|
|00002920| 66 20 73 65 74 73 20 69 | 74 73 20 77 69 6e 64 6f |f sets i|ts windo|
|00002930| 77 20 63 6f 6e 66 69 67 | 75 72 61 74 69 6f 6e 2e |w config|uration.|
|00002940| 20 0a 54 68 69 73 20 63 | 61 6e 20 62 65 20 75 73 | .This c|an be us|
|00002950| 65 64 20 74 6f 20 73 61 | 76 65 20 74 68 65 20 70 |ed to sa|ve the p|
|00002960| 72 65 76 69 6f 75 73 20 | 77 69 6e 64 6f 77 20 63 |revious |window c|
|00002970| 6f 6e 66 69 67 2c 20 77 | 68 69 63 68 20 63 61 6e |onfig, w|hich can|
|00002980| 20 62 65 20 72 65 73 74 | 6f 72 65 64 0a 6f 6e 20 | be rest|ored.on |
|00002990| 65 64 69 66 66 2d 71 75 | 69 74 20 6f 72 20 65 64 |ediff-qu|it or ed|
|000029a0| 69 66 66 2d 73 75 73 70 | 65 6e 64 2e 1f 0a 28 64 |iff-susp|end...(d|
|000029b0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 65 66 6f |efvar ed|iff-befo|
|000029c0| 72 65 2d 73 65 74 75 70 | 2d 77 69 6e 64 6f 77 73 |re-setup|-windows|
|000029d0| 2d 68 6f 6f 6b 20 6e 69 | 6c 20 28 23 24 20 2e 20 |-hook ni|l (#$ . |
|000029e0| 2d 31 30 35 30 33 29 29 | 0a 23 40 31 32 39 20 2a |-10503))|.#@129 *|
|000029f0| 48 6f 6f 6b 73 20 74 6f | 20 72 75 6e 20 61 66 74 |Hooks to| run aft|
|00002a00| 65 72 20 45 64 69 66 66 | 20 73 65 74 73 20 69 74 |er Ediff| sets it|
|00002a10| 73 20 77 69 6e 64 6f 77 | 20 63 6f 6e 66 69 67 75 |s window| configu|
|00002a20| 72 61 74 69 6f 6e 2e 20 | 0a 54 68 69 73 20 63 61 |ration. |.This ca|
|00002a30| 6e 20 62 65 20 75 73 65 | 64 20 74 6f 20 73 65 74 |n be use|d to set|
|00002a40| 20 75 70 20 63 6f 6e 74 | 72 6f 6c 20 77 69 6e 64 | up cont|rol wind|
|00002a50| 6f 77 20 6f 72 20 69 63 | 6f 6e 20 69 6e 20 61 20 |ow or ic|on in a |
|00002a60| 64 65 73 69 72 65 64 20 | 70 6c 61 63 65 2e 1f 0a |desired |place...|
|00002a70| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 61 66 |(defvar |ediff-af|
|00002a80| 74 65 72 2d 73 65 74 75 | 70 2d 77 69 6e 64 6f 77 |ter-setu|p-window|
|00002a90| 73 2d 68 6f 6f 6b 20 6e | 69 6c 20 28 23 24 20 2e |s-hook n|il (#$ .|
|00002aa0| 20 2d 31 30 37 33 35 29 | 29 0a 23 40 31 35 37 20 | -10735)|).#@157 |
|00002ab0| 2a 48 6f 6f 6b 73 20 72 | 75 6e 20 62 65 66 6f 72 |*Hooks r|un befor|
|00002ac0| 65 20 73 65 74 74 69 6e | 67 20 75 70 20 74 68 65 |e settin|g up the|
|00002ad0| 20 66 72 61 6d 65 20 74 | 6f 20 64 69 73 70 6c 61 | frame t|o displa|
|00002ae0| 79 20 45 64 69 66 66 20 | 43 6f 6e 74 72 6f 6c 20 |y Ediff |Control |
|00002af0| 50 61 6e 65 6c 2e 0a 43 | 61 6e 20 62 65 20 75 73 |Panel..C|an be us|
|00002b00| 65 64 20 74 6f 20 63 68 | 61 6e 67 65 20 63 6f 6e |ed to ch|ange con|
|00002b10| 74 72 6f 6c 20 66 72 61 | 6d 65 20 70 61 72 61 6d |trol fra|me param|
|00002b20| 65 74 65 72 73 20 74 6f | 20 70 6f 73 69 74 69 6f |eters to| positio|
|00002b30| 6e 20 69 74 20 77 68 65 | 72 65 20 69 74 0a 69 73 |n it whe|re it.is|
|00002b40| 20 64 65 73 69 72 61 62 | 6c 65 2e 1f 0a 28 64 65 | desirab|le...(de|
|00002b50| 66 76 61 72 20 65 64 69 | 66 66 2d 62 65 66 6f 72 |fvar edi|ff-befor|
|00002b60| 65 2d 73 65 74 75 70 2d | 63 6f 6e 74 72 6f 6c 2d |e-setup-|control-|
|00002b70| 66 72 61 6d 65 2d 68 6f | 6f 6b 20 6e 69 6c 20 28 |frame-ho|ok nil (|
|00002b80| 23 24 20 2e 20 2d 31 30 | 39 32 38 29 29 0a 23 40 |#$ . -10|928)).#@|
|00002b90| 31 32 32 20 2a 48 6f 6f | 6b 73 20 72 75 6e 20 61 |122 *Hoo|ks run a|
|00002ba0| 66 74 65 72 20 73 65 74 | 74 69 6e 67 20 75 70 20 |fter set|ting up |
|00002bb0| 74 68 65 20 66 72 61 6d | 65 20 74 6f 20 64 69 73 |the fram|e to dis|
|00002bc0| 70 6c 61 79 20 45 64 69 | 66 66 20 43 6f 6e 74 72 |play Edi|ff Contr|
|00002bd0| 6f 6c 20 50 61 6e 65 6c | 2e 0a 43 61 6e 20 62 65 |ol Panel|..Can be|
|00002be0| 20 75 73 65 64 20 74 6f | 20 6d 6f 76 65 20 74 68 | used to| move th|
|00002bf0| 65 20 66 72 61 6d 65 20 | 77 68 65 72 65 20 69 74 |e frame |where it|
|00002c00| 20 69 73 20 64 65 73 69 | 72 65 64 2e 1f 0a 28 64 | is desi|red...(d|
|00002c10| 65 66 76 61 72 20 65 64 | 69 66 66 2d 61 66 74 65 |efvar ed|iff-afte|
|00002c20| 72 2d 73 65 74 75 70 2d | 63 6f 6e 74 72 6f 6c 2d |r-setup-|control-|
|00002c30| 66 72 61 6d 65 2d 68 6f | 6f 6b 20 6e 69 6c 20 28 |frame-ho|ok nil (|
|00002c40| 23 24 20 2e 20 2d 31 31 | 31 35 36 29 29 0a 23 40 |#$ . -11|156)).#@|
|00002c50| 36 36 20 2a 48 6f 6f 6b | 73 20 74 6f 20 72 75 6e |66 *Hook|s to run|
|00002c60| 20 69 6e 20 74 68 65 20 | 63 6f 6e 74 72 6f 6c 20 | in the |control |
|00002c70| 62 75 66 66 65 72 20 61 | 66 74 65 72 20 45 64 69 |buffer a|fter Edi|
|00002c80| 66 66 20 68 61 73 20 62 | 65 65 6e 20 73 65 74 20 |ff has b|een set |
|00002c90| 75 70 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |up...(de|fvar edi|
|00002ca0| 66 66 2d 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 20 |ff-start|up-hook |
|00002cb0| 6e 69 6c 20 28 23 24 20 | 2e 20 2d 31 31 33 34 37 |nil (#$ |. -11347|
|00002cc0| 29 29 0a 23 40 35 33 20 | 2a 48 6f 6f 6b 73 20 74 |)).#@53 |*Hooks t|
|00002cd0| 6f 20 72 75 6e 20 61 66 | 74 65 72 20 61 20 64 69 |o run af|ter a di|
|00002ce0| 66 66 65 72 65 6e 63 65 | 20 68 61 73 20 62 65 65 |fference| has bee|
|00002cf0| 6e 20 73 65 6c 65 63 74 | 65 64 2e 1f 0a 28 64 65 |n select|ed...(de|
|00002d00| 66 76 61 72 20 65 64 69 | 66 66 2d 73 65 6c 65 63 |fvar edi|ff-selec|
|00002d10| 74 2d 68 6f 6f 6b 20 6e | 69 6c 20 28 23 24 20 2e |t-hook n|il (#$ .|
|00002d20| 20 2d 31 31 34 36 34 29 | 29 0a 23 40 35 35 20 2a | -11464)|).#@55 *|
|00002d30| 48 6f 6f 6b 73 20 74 6f | 20 72 75 6e 20 61 66 74 |Hooks to| run aft|
|00002d40| 65 72 20 61 20 64 69 66 | 66 65 72 65 6e 63 65 20 |er a dif|ference |
|00002d50| 68 61 73 20 62 65 65 6e | 20 75 6e 73 65 6c 65 63 |has been| unselec|
|00002d60| 74 65 64 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |ted...(d|efvar ed|
|00002d70| 69 66 66 2d 75 6e 73 65 | 6c 65 63 74 2d 68 6f 6f |iff-unse|lect-hoo|
|00002d80| 6b 20 6e 69 6c 20 28 23 | 24 20 2e 20 2d 31 31 35 |k nil (#|$ . -115|
|00002d90| 36 37 29 29 0a 23 40 35 | 33 20 2a 48 6f 6f 6b 73 |67)).#@5|3 *Hooks|
|00002da0| 20 63 61 6c 6c 65 64 20 | 61 66 74 65 72 20 62 75 | called |after bu|
|00002db0| 66 66 65 72 73 20 41 2c | 20 42 2c 20 61 6e 64 20 |ffers A,| B, and |
|00002dc0| 43 20 61 72 65 20 73 65 | 74 20 75 70 2e 1f 0a 28 |C are se|t up...(|
|00002dd0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 70 72 65 |defvar e|diff-pre|
|00002de0| 70 61 72 65 2d 62 75 66 | 66 65 72 2d 68 6f 6f 6b |pare-buf|fer-hook|
|00002df0| 20 6e 69 6c 20 28 23 24 | 20 2e 20 2d 31 31 36 37 | nil (#$| . -1167|
|00002e00| 34 29 29 0a 23 40 36 37 | 20 2a 48 6f 6f 6b 20 72 |4)).#@67| *Hook r|
|00002e10| 75 6e 20 61 66 74 65 72 | 20 45 64 69 66 66 20 69 |un after| Ediff i|
|00002e20| 73 20 6c 6f 61 64 65 64 | 2e 20 20 43 61 6e 20 62 |s loaded|. Can b|
|00002e30| 65 20 75 73 65 64 20 74 | 6f 20 63 68 61 6e 67 65 |e used t|o change|
|00002e40| 20 64 65 66 61 75 6c 74 | 73 2e 1f 0a 28 64 65 66 | default|s...(def|
|00002e50| 76 61 72 20 65 64 69 66 | 66 2d 6c 6f 61 64 2d 68 |var edif|f-load-h|
|00002e60| 6f 6f 6b 20 6e 69 6c 20 | 28 23 24 20 2e 20 2d 31 |ook nil |(#$ . -1|
|00002e70| 31 37 38 35 29 29 0a 23 | 40 32 30 33 20 2a 48 6f |1785)).#|@203 *Ho|
|00002e80| 6f 6b 20 72 75 6e 20 6a | 75 73 74 20 61 66 74 65 |ok run j|ust afte|
|00002e90| 72 20 65 64 69 66 66 2d | 6d 6f 64 65 20 69 73 20 |r ediff-|mode is |
|00002ea0| 73 65 74 20 75 70 20 69 | 6e 20 74 68 65 20 63 6f |set up i|n the co|
|00002eb0| 6e 74 72 6f 6c 20 62 75 | 66 66 65 72 2e 20 0a 54 |ntrol bu|ffer. .T|
|00002ec0| 68 69 73 20 69 73 20 64 | 6f 6e 65 20 62 65 66 6f |his is d|one befo|
|00002ed0| 72 65 20 61 6e 79 20 77 | 69 6e 64 6f 77 73 20 6f |re any w|indows o|
|00002ee0| 72 20 66 72 61 6d 65 73 | 20 61 72 65 20 63 72 65 |r frames| are cre|
|00002ef0| 61 74 65 64 2e 20 4f 6e | 65 20 63 61 6e 20 75 73 |ated. On|e can us|
|00002f00| 65 20 69 74 20 74 6f 0a | 73 65 74 20 6c 6f 63 61 |e it to.|set loca|
|00002f10| 6c 20 76 61 72 69 61 62 | 6c 65 73 20 74 68 61 74 |l variab|les that|
|00002f20| 20 64 65 74 65 72 6d 69 | 6e 65 20 68 6f 77 20 74 | determi|ne how t|
|00002f30| 68 65 20 64 69 73 70 6c | 61 79 20 6c 6f 6f 6b 73 |he displ|ay looks|
|00002f40| 20 6c 69 6b 65 2e 1f 0a | 28 64 65 66 76 61 72 20 | like...|(defvar |
|00002f50| 65 64 69 66 66 2d 6d 6f | 64 65 2d 68 6f 6f 6b 20 |ediff-mo|de-hook |
|00002f60| 6e 69 6c 20 28 23 24 20 | 2e 20 2d 31 31 39 30 31 |nil (#$ |. -11901|
|00002f70| 29 29 0a 23 40 37 31 20 | 2a 48 6f 6f 6b 20 72 75 |)).#@71 |*Hook ru|
|00002f80| 6e 20 6a 75 73 74 20 61 | 66 74 65 72 20 74 68 65 |n just a|fter the|
|00002f90| 20 64 65 66 61 75 6c 74 | 20 62 69 6e 64 69 6e 67 | default| binding|
|00002fa0| 73 20 69 6e 20 45 64 69 | 66 66 20 6b 65 79 6d 61 |s in Edi|ff keyma|
|00002fb0| 70 20 61 72 65 20 73 65 | 74 20 75 70 2e 1f 0a 28 |p are se|t up...(|
|00002fc0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 6b 65 79 |defvar e|diff-key|
|00002fd0| 6d 61 70 2d 73 65 74 75 | 70 2d 68 6f 6f 6b 20 6e |map-setu|p-hook n|
|00002fe0| 69 6c 20 28 23 24 20 2e | 20 2d 31 32 31 35 32 29 |il (#$ .| -12152)|
|00002ff0| 29 0a 23 40 34 36 20 2a | 48 6f 6f 6b 73 20 72 75 |).#@46 *|Hooks ru|
|00003000| 6e 20 61 66 74 65 72 20 | 70 72 65 70 61 72 69 6e |n after |preparin|
|00003010| 67 20 74 68 65 20 68 65 | 6c 70 20 6d 65 73 73 61 |g the he|lp messa|
|00003020| 67 65 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ge...(de|fvar edi|
|00003030| 66 66 2d 64 69 73 70 6c | 61 79 2d 68 65 6c 70 2d |ff-displ|ay-help-|
|00003040| 68 6f 6f 6b 20 6e 69 6c | 20 28 23 24 20 2e 20 2d |hook nil| (#$ . -|
|00003050| 31 32 32 37 39 29 29 0a | 23 40 36 38 20 2a 48 6f |12279)).|#@68 *Ho|
|00003060| 6f 6b 73 20 74 6f 20 72 | 75 6e 20 69 6e 20 74 68 |oks to r|un in th|
|00003070| 65 20 45 64 69 66 66 20 | 63 6f 6e 74 72 6f 6c 20 |e Ediff |control |
|00003080| 62 75 66 66 65 72 20 77 | 68 65 6e 20 45 64 69 66 |buffer w|hen Edif|
|00003090| 66 20 69 73 20 73 75 73 | 70 65 6e 64 65 64 2e 1f |f is sus|pended..|
|000030a0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 73 |.(defvar| ediff-s|
|000030b0| 75 73 70 65 6e 64 2d 68 | 6f 6f 6b 20 28 6c 69 73 |uspend-h|ook (lis|
|000030c0| 74 20 28 71 75 6f 74 65 | 20 65 64 69 66 66 2d 64 |t (quote| ediff-d|
|000030d0| 65 66 61 75 6c 74 2d 73 | 75 73 70 65 6e 64 2d 66 |efault-s|uspend-f|
|000030e0| 75 6e 63 74 69 6f 6e 29 | 29 20 28 23 24 20 2e 20 |unction)|) (#$ . |
|000030f0| 2d 31 32 33 38 31 29 29 | 0a 23 40 36 36 20 2a 48 |-12381))|.#@66 *H|
|00003100| 6f 6f 6b 73 20 74 6f 20 | 72 75 6e 20 69 6e 20 74 |ooks to |run in t|
|00003110| 68 65 20 45 64 69 66 66 | 20 63 6f 6e 74 72 6f 6c |he Ediff| control|
|00003120| 20 62 75 66 66 65 72 20 | 61 66 74 65 72 20 66 69 | buffer |after fi|
|00003130| 6e 69 73 68 69 6e 67 20 | 45 64 69 66 66 2e 1f 0a |nishing |Ediff...|
|00003140| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 71 75 |(defvar |ediff-qu|
|00003150| 69 74 2d 68 6f 6f 6b 20 | 28 6c 69 73 74 20 28 71 |it-hook |(list (q|
|00003160| 75 6f 74 65 20 65 64 69 | 66 66 2d 63 6c 65 61 6e |uote edi|ff-clean|
|00003170| 75 70 2d 6d 65 73 73 29 | 29 20 28 23 24 20 2e 20 |up-mess)|) (#$ . |
|00003180| 2d 31 32 35 34 32 29 29 | 0a 23 40 32 32 30 20 2a |-12542))|.#@220 *|
|00003190| 48 6f 6f 6b 73 20 74 6f | 20 72 75 6e 20 6f 6e 20 |Hooks to| run on |
|000031a0| 65 78 69 74 69 6e 67 20 | 45 64 69 66 66 20 62 75 |exiting |Ediff bu|
|000031b0| 74 20 62 65 66 6f 72 65 | 20 6b 69 6c 6c 69 6e 67 |t before| killing|
|000031c0| 20 74 68 65 20 63 6f 6e | 74 72 6f 6c 20 62 75 66 | the con|trol buf|
|000031d0| 66 65 72 2e 0a 54 68 69 | 73 20 69 73 20 61 20 70 |fer..Thi|s is a p|
|000031e0| 6c 61 63 65 20 74 6f 20 | 64 6f 20 76 61 72 69 6f |lace to |do vario|
|000031f0| 75 73 20 63 6c 65 61 6e | 75 70 73 2c 20 73 75 63 |us clean|ups, suc|
|00003200| 68 20 61 73 20 64 65 6c | 65 74 69 6e 67 20 74 68 |h as del|eting th|
|00003210| 65 20 76 61 72 69 61 6e | 74 20 62 75 66 66 65 72 |e varian|t buffer|
|00003220| 73 2e 0a 45 64 69 66 66 | 20 70 72 6f 76 69 64 65 |s..Ediff| provide|
|00003230| 73 20 61 20 66 75 6e 63 | 74 69 6f 6e 2c 20 60 65 |s a func|tion, `e|
|00003240| 64 69 66 66 2d 6a 61 6e | 69 74 6f 72 27 2c 20 61 |diff-jan|itor', a|
|00003250| 73 20 6f 6e 65 20 73 75 | 63 68 20 70 6f 73 73 69 |s one su|ch possi|
|00003260| 62 6c 65 20 68 6f 6f 6b | 2e 1f 0a 28 64 65 66 76 |ble hook|...(defv|
|00003270| 61 72 20 65 64 69 66 66 | 2d 63 6c 65 61 6e 75 70 |ar ediff|-cleanup|
|00003280| 2d 68 6f 6f 6b 20 6e 69 | 6c 20 28 23 24 20 2e 20 |-hook ni|l (#$ . |
|00003290| 2d 31 32 36 38 37 29 29 | 0a 23 40 33 36 20 54 68 |-12687))|.#@36 Th|
|000032a0| 65 20 68 65 61 64 20 6f | 66 20 74 68 65 20 66 75 |e head o|f the fu|
|000032b0| 6c 6c 20 68 65 6c 70 20 | 6d 65 73 73 61 67 65 2e |ll help |message.|
|000032c0| 1f 0a 28 64 65 66 63 6f | 6e 73 74 20 65 64 69 66 |..(defco|nst edif|
|000032d0| 66 2d 6c 6f 6e 67 2d 68 | 65 6c 70 2d 6d 65 73 73 |f-long-h|elp-mess|
|000032e0| 61 67 65 2d 68 65 61 64 | 20 22 20 20 20 4d 6f 76 |age-head| " Mov|
|000032f0| 69 6e 67 20 61 72 6f 75 | 6e 64 20 20 20 20 20 7c |ing arou|nd ||
|00003300| 20 20 20 20 20 54 6f 67 | 67 6c 69 6e 67 20 66 65 | Tog|gling fe|
|00003310| 61 74 75 72 65 73 20 20 | 20 20 20 7c 20 20 20 20 |atures | | |
|00003320| 20 20 20 4d 61 6e 69 70 | 75 6c 61 74 69 6f 6e 73 | Manip|ulations|
|00003330| 5c 6e 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |\n======|========|
|00003340| 3d 3d 3d 3d 3d 3d 3d 7c | 3d 3d 3d 3d 3d 3d 3d 3d |=======||========|
|00003350| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00003360| 3d 3d 3d 7c 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |===|====|========|
|00003370| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00003380| 3d 22 20 28 23 24 20 2e | 20 31 32 39 35 38 29 29 |=" (#$ .| 12958))|
|00003390| 0a 23 40 33 36 20 54 68 | 65 20 74 61 69 6c 20 6f |.#@36 Th|e tail o|
|000033a0| 66 20 74 68 65 20 66 75 | 6c 6c 2d 68 65 6c 70 20 |f the fu|ll-help |
|000033b0| 6d 65 73 73 61 67 65 2e | 1f 0a 28 64 65 66 63 6f |message.|..(defco|
|000033c0| 6e 73 74 20 65 64 69 66 | 66 2d 6c 6f 6e 67 2d 68 |nst edif|f-long-h|
|000033d0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 2d 74 61 69 6c |elp-mess|age-tail|
|000033e0| 20 22 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d | "======|========|
|000033f0| 3d 3d 3d 3d 3d 3d 3d 7c | 3d 3d 3d 3d 3d 3d 3d 3d |=======||========|
|00003400| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00003410| 3d 3d 3d 7c 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |===|====|========|
|00003420| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00003430| 3d 5c 6e 20 20 20 20 52 | 20 2d 73 68 6f 77 20 72 |=\n R| -show r|
|00003440| 65 67 69 73 74 72 79 20 | 7c 20 20 20 20 20 20 20 |egistry || |
|00003450| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00003460| 20 20 20 20 7c 20 20 4d | 20 20 20 2d 73 68 6f 77 | | M| -show|
|00003470| 20 73 65 73 73 69 6f 6e | 20 67 72 6f 75 70 5c 6e | session| group\n|
|00003480| 20 20 20 20 44 20 2d 64 | 69 66 66 20 6f 75 74 70 | D -d|iff outp|
|00003490| 75 74 20 20 20 7c 20 20 | 20 20 20 45 20 2d 62 72 |ut | | E -br|
|000034a0| 6f 77 73 65 20 45 64 69 | 66 66 20 6d 61 6e 75 61 |owse Edi|ff manua|
|000034b0| 6c 7c 20 20 47 20 20 20 | 2d 73 65 6e 64 20 62 75 |l| G |-send bu|
|000034c0| 67 20 72 65 70 6f 72 74 | 20 20 20 5c 6e 20 20 20 |g report| \n |
|000034d0| 20 69 20 2d 73 74 61 74 | 75 73 20 69 6e 66 6f 20 | i -stat|us info |
|000034e0| 20 20 7c 20 20 20 20 20 | 3f 20 2d 68 65 6c 70 20 | | |? -help |
|000034f0| 6f 66 66 20 20 20 20 20 | 20 20 20 20 20 20 7c 20 |off | | |
|00003500| 20 7a 2f 71 20 2d 73 75 | 73 70 65 6e 64 2f 71 75 | z/q -su|spend/qu|
|00003510| 69 74 5c 6e 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |it\n----|--------|
|00003520| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00003530| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00003540| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00003550| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00003560| 2d 2d 2d 5c 6e 58 2c 59 | 20 28 78 2c 79 29 20 20 |---\nX,Y| (x,y) |
|00003570| 6f 6e 20 74 68 65 20 6c | 65 66 74 20 61 72 65 20 |on the l|eft are |
|00003580| 6d 65 74 61 2d 73 79 6d | 62 6f 6c 73 20 66 6f 72 |meta-sym|bols for|
|00003590| 20 74 68 65 20 6b 65 79 | 73 20 20 41 2c 42 2c 43 | the key|s A,B,C|
|000035a0| 20 28 61 2c 62 2c 63 29 | 2e 5c 6e 58 2c 59 20 6f | (a,b,c)|.\nX,Y o|
|000035b0| 6e 20 74 68 65 20 72 69 | 67 68 74 20 61 72 65 20 |n the ri|ght are |
|000035c0| 6d 65 74 61 2d 73 79 6d | 62 6f 6c 73 20 66 6f 72 |meta-sym|bols for|
|000035d0| 20 62 75 66 66 65 72 73 | 20 41 2c 42 2c 43 2e 5c | buffers| A,B,C.\|
|000035e0| 6e 41 2c 42 2c 43 20 6f | 6e 20 74 68 65 20 72 69 |nA,B,C o|n the ri|
|000035f0| 67 68 74 20 64 65 6e 6f | 74 65 20 74 68 65 20 77 |ght deno|te the w|
|00003600| 6f 72 6b 69 6e 67 20 62 | 75 66 66 65 72 73 20 41 |orking b|uffers A|
|00003610| 2c 42 2c 43 2c 20 72 65 | 73 70 65 63 74 69 76 65 |,B,C, re|spective|
|00003620| 6c 79 2e 22 20 28 23 24 | 20 2e 20 31 33 32 30 36 |ly." (#$| . 13206|
|00003630| 29 29 0a 23 40 31 31 36 | 20 48 65 6c 70 20 6d 65 |)).#@116| Help me|
|00003640| 73 73 61 67 65 20 75 73 | 75 61 6c 6c 79 20 75 73 |ssage us|ually us|
|00003650| 65 64 20 66 6f 72 20 33 | 2d 77 61 79 20 63 6f 6d |ed for 3|-way com|
|00003660| 70 61 72 69 73 6f 6e 2e | 0a 4e 6f 72 6d 61 6c 6c |parison.|.Normall|
|00003670| 79 2c 20 6e 6f 74 20 61 | 20 75 73 65 72 20 6f 70 |y, not a| user op|
|00003680| 74 69 6f 6e 2e 20 53 65 | 65 20 60 65 64 69 66 66 |tion. Se|e `ediff|
|00003690| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 27 20 66 |-help-me|ssage' f|
|000036a0| 6f 72 20 64 65 74 61 69 | 6c 73 2e 1f 0a 28 64 65 |or detai|ls...(de|
|000036b0| 66 63 6f 6e 73 74 20 65 | 64 69 66 66 2d 6c 6f 6e |fconst e|diff-lon|
|000036c0| 67 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 2d 63 |g-help-m|essage-c|
|000036d0| 6f 6d 70 61 72 65 33 20 | 22 5c 6e 70 2c 44 45 4c |ompare3 |"\np,DEL|
|000036e0| 20 2d 70 72 65 76 69 6f | 75 73 20 64 69 66 66 20 | -previo|us diff |
|000036f0| 7c 20 20 20 20 20 7c 20 | 2d 76 65 72 74 2f 68 6f || | |-vert/ho|
|00003700| 72 69 7a 20 73 70 6c 69 | 74 20 20 20 7c 20 78 79 |riz spli|t | xy|
|00003710| 20 2d 63 6f 70 79 20 62 | 75 66 20 58 27 73 20 72 | -copy b|uf X's r|
|00003720| 65 67 69 6f 6e 20 74 6f | 20 59 5c 6e 6e 2c 53 50 |egion to| Y\nn,SP|
|00003730| 43 20 2d 6e 65 78 74 20 | 64 69 66 66 20 20 20 20 |C -next |diff |
|00003740| 20 7c 20 20 20 20 20 68 | 20 2d 68 69 6c 69 74 69 | | h| -hiliti|
|00003750| 6e 67 20 20 20 20 20 20 | 20 20 20 20 20 7c 20 72 |ng | | r|
|00003760| 78 20 2d 72 65 73 74 6f | 72 65 20 62 75 66 20 58 |x -resto|re buf X|
|00003770| 27 73 20 6f 6c 64 20 64 | 69 66 66 5c 6e 20 20 20 |'s old d|iff\n |
|00003780| 20 6a 20 2d 6a 75 6d 70 | 20 74 6f 20 64 69 66 66 | j -jump| to diff|
|00003790| 20 20 7c 20 20 20 20 20 | 40 20 2d 61 75 74 6f 2d | | |@ -auto-|
|000037a0| 72 65 66 69 6e 65 6d 65 | 6e 74 20 20 20 20 7c 20 |refineme|nt | |
|000037b0| 20 2a 20 2d 72 65 66 69 | 6e 65 20 63 75 72 72 65 | * -refi|ne curre|
|000037c0| 6e 74 20 72 65 67 69 6f | 6e 5c 6e 20 20 20 67 78 |nt regio|n\n gx|
|000037d0| 20 2d 67 6f 74 6f 20 58 | 27 73 20 70 6f 69 6e 74 | -goto X|'s point|
|000037e0| 7c 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 || | |
|000037f0| 20 20 20 20 20 20 20 20 | 20 20 20 20 7c 20 20 21 | | | !|
|00003800| 20 2d 75 70 64 61 74 65 | 20 64 69 66 66 20 72 65 | -update| diff re|
|00003810| 67 69 6f 6e 73 5c 6e 20 | 20 43 2d 6c 20 2d 72 65 |gions\n | C-l -re|
|00003820| 63 65 6e 74 65 72 20 20 | 20 20 20 20 7c 20 20 20 |center | | |
|00003830| 20 23 23 20 2d 69 67 6e | 6f 72 65 20 77 68 69 74 | ## -ign|ore whit|
|00003840| 65 73 70 61 63 65 20 20 | 7c 5c 6e 20 20 76 2f 56 |espace ||\n v/V|
|00003850| 20 2d 73 63 72 6f 6c 6c | 20 75 70 2f 64 6e 20 20 | -scroll| up/dn |
|00003860| 7c 20 23 66 2f 23 68 20 | 2d 66 6f 63 75 73 2f 68 || #f/#h |-focus/h|
|00003870| 69 64 65 20 72 65 67 69 | 6f 6e 73 20 7c 20 77 78 |ide regi|ons | wx|
|00003880| 20 2d 73 61 76 65 20 62 | 75 66 20 58 5c 6e 20 20 | -save b|uf X\n |
|00003890| 3c 2f 3e 20 2d 73 63 72 | 6f 6c 6c 20 6c 74 2f 72 |</> -scr|oll lt/r|
|000038a0| 74 20 20 7c 20 20 20 20 | 20 58 20 2d 72 65 61 64 |t | | X -read|
|000038b0| 2d 6f 6e 6c 79 20 69 6e | 20 62 75 66 20 58 20 7c |-only in| buf X ||
|000038c0| 20 77 64 20 2d 73 61 76 | 65 20 64 69 66 66 20 6f | wd -sav|e diff o|
|000038d0| 75 74 70 75 74 5c 6e 20 | 20 20 20 20 20 20 20 20 |utput\n | |
|000038e0| 20 20 20 20 20 20 20 20 | 20 20 20 20 7c 20 20 20 | | | |
|000038f0| 20 20 6d 20 2d 77 69 64 | 65 20 64 69 73 70 6c 61 | m -wid|e displa|
|00003900| 79 20 20 20 20 20 20 20 | 7c 20 20 7e 20 2d 72 6f |y || ~ -ro|
|00003910| 74 61 74 65 20 62 75 66 | 66 65 72 73 5c 6e 22 20 |tate buf|fers\n" |
|00003920| 28 23 24 20 2e 20 31 33 | 38 38 31 29 29 0a 23 40 |(#$ . 13|881)).#@|
|00003930| 31 31 36 20 48 65 6c 70 | 20 6d 65 73 73 61 67 65 |116 Help| message|
|00003940| 20 75 73 75 61 6c 6c 79 | 20 75 73 65 64 20 66 6f | usually| used fo|
|00003950| 72 20 32 2d 77 61 79 20 | 63 6f 6d 70 61 72 69 73 |r 2-way |comparis|
|00003960| 6f 6e 2e 0a 4e 6f 72 6d | 61 6c 6c 79 2c 20 6e 6f |on..Norm|ally, no|
|00003970| 74 20 61 20 75 73 65 72 | 20 6f 70 74 69 6f 6e 2e |t a user| option.|
|00003980| 20 53 65 65 20 60 65 64 | 69 66 66 2d 68 65 6c 70 | See `ed|iff-help|
|00003990| 2d 6d 65 73 73 61 67 65 | 27 20 66 6f 72 20 64 65 |-message|' for de|
|000039a0| 74 61 69 6c 73 2e 1f 0a | 28 64 65 66 63 6f 6e 73 |tails...|(defcons|
|000039b0| 74 20 65 64 69 66 66 2d | 6c 6f 6e 67 2d 68 65 6c |t ediff-|long-hel|
|000039c0| 70 2d 6d 65 73 73 61 67 | 65 2d 63 6f 6d 70 61 72 |p-messag|e-compar|
|000039d0| 65 32 20 22 5c 6e 70 2c | 44 45 4c 20 2d 70 72 65 |e2 "\np,|DEL -pre|
|000039e0| 76 69 6f 75 73 20 64 69 | 66 66 20 7c 20 20 20 20 |vious di|ff | |
|000039f0| 20 7c 20 2d 76 65 72 74 | 2f 68 6f 72 69 7a 20 73 | | -vert|/horiz s|
|00003a00| 70 6c 69 74 20 20 20 7c | 61 2f 62 20 2d 63 6f 70 |plit ||a/b -cop|
|00003a10| 79 20 41 2f 42 27 73 20 | 72 65 67 69 6f 6e 20 74 |y A/B's |region t|
|00003a20| 6f 20 42 2f 41 5c 6e 6e | 2c 53 50 43 20 2d 6e 65 |o B/A\nn|,SPC -ne|
|00003a30| 78 74 20 64 69 66 66 20 | 20 20 20 20 7c 20 20 20 |xt diff | | |
|00003a40| 20 20 68 20 2d 68 69 6c | 69 74 69 6e 67 20 20 20 | h -hil|iting |
|00003a50| 20 20 20 20 20 20 20 20 | 7c 20 72 78 20 2d 72 65 | || rx -re|
|00003a60| 73 74 6f 72 65 20 62 75 | 66 20 58 27 73 20 6f 6c |store bu|f X's ol|
|00003a70| 64 20 64 69 66 66 5c 6e | 20 20 20 20 6a 20 2d 6a |d diff\n| j -j|
|00003a80| 75 6d 70 20 74 6f 20 64 | 69 66 66 20 20 7c 20 20 |ump to d|iff | |
|00003a90| 20 20 20 40 20 2d 61 75 | 74 6f 2d 72 65 66 69 6e | @ -au|to-refin|
|00003aa0| 65 6d 65 6e 74 20 20 20 | 20 7c 20 20 2a 20 2d 72 |ement | | * -r|
|00003ab0| 65 66 69 6e 65 20 63 75 | 72 72 65 6e 74 20 72 65 |efine cu|rrent re|
|00003ac0| 67 69 6f 6e 5c 6e 20 20 | 20 67 78 20 2d 67 6f 74 |gion\n | gx -got|
|00003ad0| 6f 20 58 27 73 20 70 6f | 69 6e 74 7c 20 20 20 20 |o X's po|int| |
|00003ae0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00003af0| 20 20 20 20 20 20 20 7c | 20 20 21 20 2d 75 70 64 | || ! -upd|
|00003b00| 61 74 65 20 64 69 66 66 | 20 72 65 67 69 6f 6e 73 |ate diff| regions|
|00003b10| 5c 6e 20 20 43 2d 6c 20 | 2d 72 65 63 65 6e 74 65 |\n C-l |-recente|
|00003b20| 72 20 20 20 20 20 20 7c | 20 20 20 20 23 23 20 2d |r || ## -|
|00003b30| 69 67 6e 6f 72 65 20 77 | 68 69 74 65 73 70 61 63 |ignore w|hitespac|
|00003b40| 65 20 20 7c 5c 6e 20 20 | 76 2f 56 20 2d 73 63 72 |e |\n |v/V -scr|
|00003b50| 6f 6c 6c 20 75 70 2f 64 | 6e 20 20 7c 20 23 66 2f |oll up/d|n | #f/|
|00003b60| 23 68 20 2d 66 6f 63 75 | 73 2f 68 69 64 65 20 72 |#h -focu|s/hide r|
|00003b70| 65 67 69 6f 6e 73 20 7c | 20 77 78 20 2d 73 61 76 |egions || wx -sav|
|00003b80| 65 20 62 75 66 20 58 5c | 6e 20 20 3c 2f 3e 20 2d |e buf X\|n </> -|
|00003b90| 73 63 72 6f 6c 6c 20 6c | 74 2f 72 74 20 20 7c 20 |scroll l|t/rt | |
|00003ba0| 20 20 20 20 58 20 2d 72 | 65 61 64 2d 6f 6e 6c 79 | X -r|ead-only|
|00003bb0| 20 69 6e 20 62 75 66 20 | 58 20 7c 20 77 64 20 2d | in buf |X | wd -|
|00003bc0| 73 61 76 65 20 64 69 66 | 66 20 6f 75 74 70 75 74 |save dif|f output|
|00003bd0| 5c 6e 20 20 20 20 7e 20 | 2d 73 77 61 70 20 76 61 |\n ~ |-swap va|
|00003be0| 72 69 61 6e 74 73 20 7c | 20 20 20 20 20 6d 20 2d |riants || m -|
|00003bf0| 77 69 64 65 20 64 69 73 | 70 6c 61 79 20 20 20 20 |wide dis|play |
|00003c00| 20 20 20 7c 20 20 5c 6e | 22 20 28 23 24 20 2e 20 | | \n|" (#$ . |
|00003c10| 31 34 36 34 34 29 29 0a | 23 40 31 32 39 20 48 65 |14644)).|#@129 He|
|00003c20| 6c 70 20 6d 65 73 73 61 | 67 65 20 77 68 65 6e 20 |lp messa|ge when |
|00003c30| 63 6f 6d 70 61 72 69 6e | 67 20 77 69 6e 64 6f 77 |comparin|g window|
|00003c40| 73 20 6f 72 20 72 65 67 | 69 6f 6e 73 20 6c 69 6e |s or reg|ions lin|
|00003c50| 65 2d 62 79 2d 6c 69 6e | 65 2e 0a 4e 6f 72 6d 61 |e-by-lin|e..Norma|
|00003c60| 6c 6c 79 2c 20 6e 6f 74 | 20 61 20 75 73 65 72 20 |lly, not| a user |
|00003c70| 6f 70 74 69 6f 6e 2e 20 | 53 65 65 20 60 65 64 69 |option. |See `edi|
|00003c80| 66 66 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 27 |ff-help-|message'|
|00003c90| 20 66 6f 72 20 64 65 74 | 61 69 6c 73 2e 1f 0a 28 | for det|ails...(|
|00003ca0| 64 65 66 63 6f 6e 73 74 | 20 65 64 69 66 66 2d 6c |defconst| ediff-l|
|00003cb0| 6f 6e 67 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |ong-help|-message|
|00003cc0| 2d 6e 61 72 72 6f 77 32 | 20 22 5c 6e 70 2c 44 45 |-narrow2| "\np,DE|
|00003cd0| 4c 20 2d 70 72 65 76 69 | 6f 75 73 20 64 69 66 66 |L -previ|ous diff|
|00003ce0| 20 7c 20 20 20 20 20 7c | 20 2d 76 65 72 74 2f 68 | | || -vert/h|
|00003cf0| 6f 72 69 7a 20 73 70 6c | 69 74 20 20 20 7c 61 2f |oriz spl|it |a/|
|00003d00| 62 20 2d 63 6f 70 79 20 | 41 2f 42 27 73 20 72 65 |b -copy |A/B's re|
|00003d10| 67 69 6f 6e 20 74 6f 20 | 42 2f 41 5c 6e 6e 2c 53 |gion to |B/A\nn,S|
|00003d20| 50 43 20 2d 6e 65 78 74 | 20 64 69 66 66 20 20 20 |PC -next| diff |
|00003d30| 20 20 7c 20 20 20 20 20 | 68 20 2d 68 69 6c 69 74 | | |h -hilit|
|00003d40| 69 6e 67 20 20 20 20 20 | 20 20 20 20 20 20 7c 20 |ing | | |
|00003d50| 72 78 20 2d 72 65 73 74 | 6f 72 65 20 62 75 66 20 |rx -rest|ore buf |
|00003d60| 58 27 73 20 6f 6c 64 20 | 64 69 66 66 5c 6e 20 20 |X's old |diff\n |
|00003d70| 20 20 6a 20 2d 6a 75 6d | 70 20 74 6f 20 64 69 66 | j -jum|p to dif|
|00003d80| 66 20 20 7c 20 20 20 20 | 20 40 20 2d 61 75 74 6f |f | | @ -auto|
|00003d90| 2d 72 65 66 69 6e 65 6d | 65 6e 74 20 20 20 20 7c |-refinem|ent ||
|00003da0| 20 20 2a 20 2d 72 65 66 | 69 6e 65 20 63 75 72 72 | * -ref|ine curr|
|00003db0| 65 6e 74 20 72 65 67 69 | 6f 6e 5c 6e 20 20 20 67 |ent regi|on\n g|
|00003dc0| 78 20 2d 67 6f 74 6f 20 | 58 27 73 20 70 6f 69 6e |x -goto |X's poin|
|00003dd0| 74 7c 20 20 20 20 20 25 | 20 2d 6e 61 72 72 6f 77 |t| %| -narrow|
|00003de0| 2f 77 69 64 65 6e 20 62 | 75 66 66 73 20 7c 20 20 |/widen b|uffs | |
|00003df0| 21 20 2d 75 70 64 61 74 | 65 20 64 69 66 66 20 72 |! -updat|e diff r|
|00003e00| 65 67 69 6f 6e 73 5c 6e | 20 20 43 2d 6c 20 2d 72 |egions\n| C-l -r|
|00003e10| 65 63 65 6e 74 65 72 20 | 20 20 20 20 20 7c 20 20 |ecenter | | |
|00003e20| 20 20 23 23 20 2d 69 67 | 6e 6f 72 65 20 77 68 69 | ## -ig|nore whi|
|00003e30| 74 65 73 70 61 63 65 20 | 20 7c 5c 6e 20 20 76 2f |tespace | |\n v/|
|00003e40| 56 20 2d 73 63 72 6f 6c | 6c 20 75 70 2f 64 6e 20 |V -scrol|l up/dn |
|00003e50| 20 7c 20 23 66 2f 23 68 | 20 2d 66 6f 63 75 73 2f | | #f/#h| -focus/|
|00003e60| 68 69 64 65 20 72 65 67 | 69 6f 6e 73 20 7c 20 77 |hide reg|ions | w|
|00003e70| 78 20 2d 73 61 76 65 20 | 62 75 66 20 58 5c 6e 20 |x -save |buf X\n |
|00003e80| 20 3c 2f 3e 20 2d 73 63 | 72 6f 6c 6c 20 6c 74 2f | </> -sc|roll lt/|
|00003e90| 72 74 20 20 7c 20 20 20 | 20 20 58 20 2d 72 65 61 |rt | | X -rea|
|00003ea0| 64 2d 6f 6e 6c 79 20 69 | 6e 20 62 75 66 20 58 20 |d-only i|n buf X |
|00003eb0| 7c 20 77 64 20 2d 73 61 | 76 65 20 64 69 66 66 20 || wd -sa|ve diff |
|00003ec0| 6f 75 74 70 75 74 5c 6e | 20 20 20 20 7e 20 2d 73 |output\n| ~ -s|
|00003ed0| 77 61 70 20 76 61 72 69 | 61 6e 74 73 20 7c 20 20 |wap vari|ants | |
|00003ee0| 20 20 20 6d 20 2d 77 69 | 64 65 20 64 69 73 70 6c | m -wi|de displ|
|00003ef0| 61 79 20 20 20 20 20 20 | 20 7c 20 20 5c 6e 22 20 |ay | | \n" |
|00003f00| 28 23 24 20 2e 20 31 35 | 33 39 30 29 29 0a 23 40 |(#$ . 15|390)).#@|
|00003f10| 31 32 39 20 48 65 6c 70 | 20 6d 65 73 73 61 67 65 |129 Help| message|
|00003f20| 20 77 68 65 6e 20 63 6f | 6d 70 61 72 69 6e 67 20 | when co|mparing |
|00003f30| 77 69 6e 64 6f 77 73 20 | 6f 72 20 72 65 67 69 6f |windows |or regio|
|00003f40| 6e 73 20 77 6f 72 64 2d | 62 79 2d 77 6f 72 64 2e |ns word-|by-word.|
|00003f50| 0a 4e 6f 72 6d 61 6c 6c | 79 2c 20 6e 6f 74 20 61 |.Normall|y, not a|
|00003f60| 20 75 73 65 72 20 6f 70 | 74 69 6f 6e 2e 20 53 65 | user op|tion. Se|
|00003f70| 65 20 60 65 64 69 66 66 | 2d 68 65 6c 70 2d 6d 65 |e `ediff|-help-me|
|00003f80| 73 73 61 67 65 27 20 66 | 6f 72 20 64 65 74 61 69 |ssage' f|or detai|
|00003f90| 6c 73 2e 1f 0a 28 64 65 | 66 63 6f 6e 73 74 20 65 |ls...(de|fconst e|
|00003fa0| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|00003fb0| 65 73 73 61 67 65 2d 77 | 6f 72 64 2d 6d 6f 64 65 |essage-w|ord-mode|
|00003fc0| 20 22 5c 6e 70 2c 44 45 | 4c 20 2d 70 72 65 76 69 | "\np,DE|L -previ|
|00003fd0| 6f 75 73 20 64 69 66 66 | 20 7c 20 20 20 20 20 7c |ous diff| | ||
|00003fe0| 20 2d 76 65 72 74 2f 68 | 6f 72 69 7a 20 73 70 6c | -vert/h|oriz spl|
|00003ff0| 69 74 20 20 20 7c 20 78 | 79 20 2d 63 6f 70 79 20 |it | x|y -copy |
|00004000| 62 75 66 20 58 27 73 20 | 72 65 67 69 6f 6e 20 74 |buf X's |region t|
|00004010| 6f 20 59 5c 6e 6e 2c 53 | 50 43 20 2d 6e 65 78 74 |o Y\nn,S|PC -next|
|00004020| 20 64 69 66 66 20 20 20 | 20 20 7c 20 20 20 20 20 | diff | | |
|00004030| 68 20 2d 68 69 6c 69 74 | 69 6e 67 20 20 20 20 20 |h -hilit|ing |
|00004040| 20 20 20 20 20 20 7c 20 | 72 78 20 2d 72 65 73 74 | | |rx -rest|
|00004050| 6f 72 65 20 62 75 66 20 | 58 27 73 20 6f 6c 64 20 |ore buf |X's old |
|00004060| 64 69 66 66 5c 6e 20 20 | 20 20 6a 20 2d 6a 75 6d |diff\n | j -jum|
|00004070| 70 20 74 6f 20 64 69 66 | 66 20 20 7c 20 20 20 20 |p to dif|f | |
|00004080| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00004090| 20 20 20 20 20 20 20 7c | 20 20 20 20 20 20 20 20 | || |
|000040a0| 20 20 20 20 20 20 20 20 | 20 20 20 5c 6e 20 20 20 | | \n |
|000040b0| 67 78 20 2d 67 6f 74 6f | 20 58 27 73 20 70 6f 69 |gx -goto| X's poi|
|000040c0| 6e 74 7c 20 20 20 20 20 | 25 20 2d 6e 61 72 72 6f |nt| |% -narro|
|000040d0| 77 2f 77 69 64 65 6e 20 | 62 75 66 66 73 20 7c 20 |w/widen |buffs | |
|000040e0| 20 21 20 2d 72 65 63 6f | 6d 70 75 74 65 20 64 69 | ! -reco|mpute di|
|000040f0| 66 66 73 5c 6e 20 20 43 | 2d 6c 20 2d 72 65 63 65 |ffs\n C|-l -rece|
|00004100| 6e 74 65 72 20 20 20 20 | 20 20 7c 20 20 20 20 20 |nter | | |
|00004110| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00004120| 20 20 20 20 20 20 7c 5c | 6e 20 20 76 2f 56 20 2d | |\|n v/V -|
|00004130| 73 63 72 6f 6c 6c 20 75 | 70 2f 64 6e 20 20 7c 20 |scroll u|p/dn | |
|00004140| 23 66 2f 23 68 20 2d 66 | 6f 63 75 73 2f 68 69 64 |#f/#h -f|ocus/hid|
|00004150| 65 20 72 65 67 69 6f 6e | 73 20 7c 20 77 78 20 2d |e region|s | wx -|
|00004160| 73 61 76 65 20 62 75 66 | 20 58 5c 6e 20 20 3c 2f |save buf| X\n </|
|00004170| 3e 20 2d 73 63 72 6f 6c | 6c 20 6c 74 2f 72 74 20 |> -scrol|l lt/rt |
|00004180| 20 7c 20 20 20 20 20 58 | 20 2d 72 65 61 64 2d 6f | | X| -read-o|
|00004190| 6e 6c 79 20 69 6e 20 62 | 75 66 20 58 20 7c 20 77 |nly in b|uf X | w|
|000041a0| 64 20 2d 73 61 76 65 20 | 64 69 66 66 20 6f 75 74 |d -save |diff out|
|000041b0| 70 75 74 5c 6e 20 20 20 | 20 7e 20 2d 73 77 61 70 |put\n | ~ -swap|
|000041c0| 20 76 61 72 69 61 6e 74 | 73 20 7c 20 20 20 20 20 | variant|s | |
|000041d0| 6d 20 2d 77 69 64 65 20 | 64 69 73 70 6c 61 79 20 |m -wide |display |
|000041e0| 20 20 20 20 20 20 7c 20 | 20 5c 6e 22 20 28 23 24 | | | \n" (#$|
|000041f0| 20 2e 20 31 36 31 34 38 | 29 29 0a 23 40 39 37 20 | . 16148|)).#@97 |
|00004200| 48 65 6c 70 20 6d 65 73 | 73 61 67 65 20 64 75 72 |Help mes|sage dur|
|00004210| 69 6e 67 20 6d 65 72 67 | 69 6e 67 2e 0a 4e 6f 72 |ing merg|ing..Nor|
|00004220| 6d 61 6c 6c 79 2c 20 6e | 6f 74 20 61 20 75 73 65 |mally, n|ot a use|
|00004230| 72 20 6f 70 74 69 6f 6e | 2e 20 53 65 65 20 60 65 |r option|. See `e|
|00004240| 64 69 66 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |diff-hel|p-messag|
|00004250| 65 27 20 66 6f 72 20 64 | 65 74 61 69 6c 73 2e 1f |e' for d|etails..|
|00004260| 0a 28 64 65 66 63 6f 6e | 73 74 20 65 64 69 66 66 |.(defcon|st ediff|
|00004270| 2d 6c 6f 6e 67 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |-long-he|lp-messa|
|00004280| 67 65 2d 6d 65 72 67 65 | 20 22 5c 6e 70 2c 44 45 |ge-merge| "\np,DE|
|00004290| 4c 20 2d 70 72 65 76 69 | 6f 75 73 20 64 69 66 66 |L -previ|ous diff|
|000042a0| 20 7c 20 20 20 20 20 7c | 20 2d 76 65 72 74 2f 68 | | || -vert/h|
|000042b0| 6f 72 69 7a 20 73 70 6c | 69 74 20 20 20 7c 20 20 |oriz spl|it | |
|000042c0| 78 20 2d 63 6f 70 79 20 | 62 75 66 20 58 27 73 20 |x -copy |buf X's |
|000042d0| 72 65 67 69 6f 6e 20 74 | 6f 20 43 5c 6e 6e 2c 53 |region t|o C\nn,S|
|000042e0| 50 43 20 2d 6e 65 78 74 | 20 64 69 66 66 20 20 20 |PC -next| diff |
|000042f0| 20 20 7c 20 20 20 20 20 | 68 20 2d 68 69 6c 69 74 | | |h -hilit|
|00004300| 69 6e 67 20 20 20 20 20 | 20 20 20 20 20 20 7c 20 |ing | | |
|00004310| 20 72 20 2d 72 65 73 74 | 6f 72 65 20 62 75 66 20 | r -rest|ore buf |
|00004320| 43 27 73 20 6f 6c 64 20 | 64 69 66 66 5c 6e 20 20 |C's old |diff\n |
|00004330| 20 20 6a 20 2d 6a 75 6d | 70 20 74 6f 20 64 69 66 | j -jum|p to dif|
|00004340| 66 20 20 7c 20 20 20 20 | 20 40 20 2d 61 75 74 6f |f | | @ -auto|
|00004350| 2d 72 65 66 69 6e 65 6d | 65 6e 74 20 20 20 20 7c |-refinem|ent ||
|00004360| 20 20 2a 20 2d 72 65 66 | 69 6e 65 20 63 75 72 72 | * -ref|ine curr|
|00004370| 65 6e 74 20 72 65 67 69 | 6f 6e 5c 6e 20 20 20 67 |ent regi|on\n g|
|00004380| 78 20 2d 67 6f 74 6f 20 | 58 27 73 20 70 6f 69 6e |x -goto |X's poin|
|00004390| 74 7c 20 20 20 20 23 23 | 20 2d 69 67 6e 6f 72 65 |t| ##| -ignore|
|000043a0| 20 77 68 69 74 65 73 70 | 61 63 65 20 20 7c 20 20 | whitesp|ace | |
|000043b0| 21 20 2d 75 70 64 61 74 | 65 20 64 69 66 66 20 72 |! -updat|e diff r|
|000043c0| 65 67 69 6f 6e 73 5c 6e | 20 20 43 2d 6c 20 2d 72 |egions\n| C-l -r|
|000043d0| 65 63 65 6e 74 65 72 20 | 20 20 20 20 20 7c 20 23 |ecenter | | #|
|000043e0| 66 2f 23 68 20 2d 66 6f | 63 75 73 2f 68 69 64 65 |f/#h -fo|cus/hide|
|000043f0| 20 72 65 67 69 6f 6e 73 | 20 7c 20 20 2b 20 2d 63 | regions| | + -c|
|00004400| 6f 6d 62 69 6e 65 20 64 | 69 66 66 20 72 65 67 69 |ombine d|iff regi|
|00004410| 6f 6e 73 5c 6e 20 20 76 | 2f 56 20 2d 73 63 72 6f |ons\n v|/V -scro|
|00004420| 6c 6c 20 75 70 2f 64 6e | 20 20 7c 20 20 20 20 20 |ll up/dn| | |
|00004430| 58 20 2d 72 65 61 64 2d | 6f 6e 6c 79 20 69 6e 20 |X -read-|only in |
|00004440| 62 75 66 20 58 20 7c 20 | 77 78 20 2d 73 61 76 65 |buf X | |wx -save|
|00004450| 20 62 75 66 20 58 5c 6e | 20 20 3c 2f 3e 20 2d 73 | buf X\n| </> -s|
|00004460| 63 72 6f 6c 6c 20 6c 74 | 2f 72 74 20 20 7c 20 20 |croll lt|/rt | |
|00004470| 20 20 20 6d 20 2d 77 69 | 64 65 20 64 69 73 70 6c | m -wi|de displ|
|00004480| 61 79 20 20 20 20 20 20 | 20 7c 20 77 64 20 2d 73 |ay | | wd -s|
|00004490| 61 76 65 20 64 69 66 66 | 20 6f 75 74 70 75 74 5c |ave diff| output\|
|000044a0| 6e 20 20 20 20 7e 20 2d | 73 77 61 70 20 76 61 72 |n ~ -|swap var|
|000044b0| 69 61 6e 74 73 20 7c 20 | 20 20 20 20 73 20 2d 73 |iants | | s -s|
|000044c0| 68 72 69 6e 6b 20 77 69 | 6e 64 6f 77 20 43 20 20 |hrink wi|ndow C |
|000044d0| 20 20 7c 20 20 2f 20 2d | 73 68 6f 77 20 61 6e 63 | | / -|show anc|
|000044e0| 65 73 74 6f 72 20 62 75 | 66 66 20 5c 6e 20 20 20 |estor bu|ff \n |
|000044f0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00004500| 20 20 7c 20 20 20 20 20 | 24 20 2d 73 68 6f 77 20 | | |$ -show |
|00004510| 63 6c 61 73 68 65 73 20 | 6f 6e 6c 79 20 20 7c 20 |clashes |only | |
|00004520| 20 26 20 2d 6d 65 72 67 | 65 20 77 2f 6e 65 77 20 | & -merg|e w/new |
|00004530| 64 65 66 61 75 6c 74 5c | 6e 22 20 28 23 24 20 2e |default\|n" (#$ .|
|00004540| 20 31 36 38 39 36 29 29 | 0a 23 40 36 38 20 4e 6f | 16896))|.#@68 No|
|00004550| 72 6d 61 6c 6c 79 2c 20 | 6e 6f 74 20 61 20 75 73 |rmally, |not a us|
|00004560| 65 72 20 6f 70 74 69 6f | 6e 2e 20 53 65 65 20 60 |er optio|n. See `|
|00004570| 65 64 69 66 66 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |ediff-he|lp-messa|
|00004580| 67 65 27 20 66 6f 72 20 | 64 65 74 61 69 6c 73 2e |ge' for |details.|
|00004590| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|000045a0| 6c 6f 6e 67 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |long-hel|p-messag|
|000045b0| 65 20 22 22 20 28 23 24 | 20 2e 20 31 37 37 34 32 |e "" (#$| . 17742|
|000045c0| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|000045d0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|000045e0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|000045f0| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 6c 6f 6e |-local e|diff-lon|
|00004600| 67 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 20 70 |g-help-m|essage p|
|00004610| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00004620| 61 6c 20 74 5d 20 34 29 | 0a 23 40 33 37 20 43 6f |al t] 4)|.#@37 Co|
|00004630| 6e 74 65 6e 74 73 20 6f | 66 20 74 68 65 20 62 72 |ntents o|f the br|
|00004640| 69 65 66 20 68 65 6c 70 | 20 6d 65 73 73 61 67 65 |ief help| message|
|00004650| 2e 1f 0a 28 64 65 66 63 | 6f 6e 73 74 20 65 64 69 |...(defc|onst edi|
|00004660| 66 66 2d 62 72 69 65 66 | 2d 6d 65 73 73 61 67 65 |ff-brief|-message|
|00004670| 2d 73 74 72 69 6e 67 20 | 22 20 20 3f 20 2d 20 68 |-string |" ? - h|
|00004680| 65 6c 70 20 20 22 20 28 | 23 24 20 2e 20 31 37 39 |elp " (|#$ . 179|
|00004690| 36 36 29 29 0a 23 40 36 | 38 20 4e 6f 72 6d 61 6c |66)).#@6|8 Normal|
|000046a0| 6c 79 2c 20 6e 6f 74 20 | 61 20 75 73 65 72 20 6f |ly, not |a user o|
|000046b0| 70 74 69 6f 6e 2e 20 53 | 65 65 20 60 65 64 69 66 |ption. S|ee `edif|
|000046c0| 66 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 27 20 |f-help-m|essage' |
|000046d0| 66 6f 72 20 64 65 74 61 | 69 6c 73 2e 1f 0a 28 64 |for deta|ils...(d|
|000046e0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 72 69 65 |efvar ed|iff-brie|
|000046f0| 66 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 20 22 |f-help-m|essage "|
|00004700| 22 20 28 23 24 20 2e 20 | 31 38 30 37 34 29 29 0a |" (#$ . |18074)).|
|00004710| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004720| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004730| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004740| 63 61 6c 20 65 64 69 66 | 66 2d 62 72 69 65 66 2d |cal edif|f-brief-|
|00004750| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 20 70 75 74 |help-mes|sage put|
|00004760| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00004770| 20 74 5d 20 34 29 0a 23 | 40 31 39 34 20 54 68 65 | t] 4).#|@194 The|
|00004780| 20 62 72 69 65 66 20 68 | 65 6c 70 20 6d 65 73 73 | brief h|elp mess|
|00004790| 61 67 65 20 74 68 61 74 | 20 74 68 65 20 75 73 65 |age that| the use|
|000047a0| 72 20 63 61 6e 20 63 75 | 73 74 6f 6d 69 7a 65 2e |r can cu|stomize.|
|000047b0| 0a 49 66 20 74 68 65 20 | 75 73 65 72 20 73 65 74 |.If the |user set|
|000047c0| 73 20 74 68 69 73 20 74 | 6f 20 61 20 70 61 72 61 |s this t|o a para|
|000047d0| 6d 65 74 65 72 2d 6c 65 | 73 73 20 66 75 6e 63 74 |meter-le|ss funct|
|000047e0| 69 6f 6e 2c 20 45 64 69 | 66 66 20 77 69 6c 6c 20 |ion, Edi|ff will |
|000047f0| 75 73 65 20 69 74 20 74 | 6f 0a 70 72 6f 64 75 63 |use it t|o.produc|
|00004800| 65 20 74 68 65 20 62 72 | 69 65 66 20 68 65 6c 70 |e the br|ief help|
|00004810| 20 6d 65 73 73 61 67 65 | 2e 20 54 68 69 73 20 66 | message|. This f|
|00004820| 75 6e 63 74 69 6f 6e 20 | 6d 75 73 74 20 72 65 74 |unction |must ret|
|00004830| 75 72 6e 20 61 20 73 74 | 72 69 6e 67 2e 1f 0a 28 |urn a st|ring...(|
|00004840| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 62 72 69 |defvar e|diff-bri|
|00004850| 65 66 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 2d |ef-help-|message-|
|00004860| 66 75 6e 63 74 69 6f 6e | 20 6e 69 6c 20 28 23 24 |function| nil (#$|
|00004870| 20 2e 20 31 38 33 30 31 | 29 29 0a 28 62 79 74 65 | . 18301|)).(byte|
|00004880| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00004890| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000048a0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000048b0| 64 69 66 66 2d 62 72 69 | 65 66 2d 68 65 6c 70 2d |diff-bri|ef-help-|
|000048c0| 6d 65 73 73 61 67 65 2d | 66 75 6e 63 74 69 6f 6e |message-|function|
|000048d0| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|000048e0| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 31 30 32 |ocal t] |4).#@102|
|000048f0| 20 54 68 65 20 6c 6f 6e | 67 20 68 65 6c 70 20 6d | The lon|g help m|
|00004900| 65 73 73 61 67 65 20 74 | 68 61 74 20 74 68 65 20 |essage t|hat the |
|00004910| 75 73 65 72 20 63 61 6e | 20 63 75 73 74 6f 6d 69 |user can| customi|
|00004920| 7a 65 2e 0a 53 65 65 20 | 60 65 64 69 66 66 2d 62 |ze..See |`ediff-b|
|00004930| 72 69 65 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |rief-hel|p-messag|
|00004940| 65 2d 66 75 6e 63 74 69 | 6f 6e 27 20 66 6f 72 20 |e-functi|on' for |
|00004950| 6d 6f 72 65 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |more...(|defvar e|
|00004960| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|00004970| 65 73 73 61 67 65 2d 66 | 75 6e 63 74 69 6f 6e 20 |essage-f|unction |
|00004980| 6e 69 6c 20 28 23 24 20 | 2e 20 31 38 36 37 33 29 |nil (#$ |. 18673)|
|00004990| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000049a0| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|000049b0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|000049c0| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 6c 6f 6e 67 |local ed|iff-long|
|000049d0| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 2d 66 75 |-help-me|ssage-fu|
|000049e0| 6e 63 74 69 6f 6e 20 70 | 75 74 20 70 65 72 6d 61 |nction p|ut perma|
|000049f0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00004a00| 0a 23 40 37 34 20 2a 49 | 66 20 74 2c 20 45 64 69 |.#@74 *I|f t, Edi|
|00004a10| 66 66 20 64 69 73 70 6c | 61 79 73 20 61 20 6c 6f |ff displ|ays a lo|
|00004a20| 6e 67 20 68 65 6c 70 20 | 6d 65 73 73 61 67 65 2e |ng help |message.|
|00004a30| 20 53 68 6f 72 74 20 68 | 65 6c 70 20 6d 65 73 73 | Short h|elp mess|
|00004a40| 61 67 65 20 6f 74 68 65 | 72 77 69 73 65 2e 1f 0a |age othe|rwise...|
|00004a50| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 75 73 |(defvar |ediff-us|
|00004a60| 65 2d 6c 6f 6e 67 2d 68 | 65 6c 70 2d 6d 65 73 73 |e-long-h|elp-mess|
|00004a70| 61 67 65 20 6e 69 6c 20 | 28 23 24 20 2e 20 2d 31 |age nil |(#$ . -1|
|00004a80| 38 39 35 30 29 29 0a 23 | 40 32 36 33 20 54 68 65 |8950)).#|@263 The|
|00004a90| 20 61 63 74 75 61 6c 20 | 68 65 6c 70 20 6d 65 73 | actual |help mes|
|00004aa0| 73 61 67 65 2e 0a 4e 6f | 72 6d 61 6c 6c 79 2c 20 |sage..No|rmally, |
|00004ab0| 74 68 65 20 75 73 65 72 | 20 73 68 6f 75 6c 64 6e |the user| shouldn|
|00004ac0| 27 74 20 74 6f 75 63 68 | 20 74 68 69 73 2e 20 48 |'t touch| this. H|
|00004ad0| 6f 77 65 76 65 72 2c 20 | 69 66 20 79 6f 75 20 77 |owever, |if you w|
|00004ae0| 61 6e 74 20 45 64 69 66 | 66 20 74 6f 0a 73 74 61 |ant Edif|f to.sta|
|00004af0| 72 74 20 75 70 20 77 69 | 74 68 20 64 69 66 66 65 |rt up wi|th diffe|
|00004b00| 72 65 6e 74 20 68 65 6c | 70 20 6d 65 73 73 61 67 |rent hel|p messag|
|00004b10| 65 73 20 66 6f 72 20 64 | 69 66 66 65 72 65 6e 74 |es for d|ifferent|
|00004b20| 20 6a 6f 62 73 2c 20 79 | 6f 75 20 63 61 6e 20 63 | jobs, y|ou can c|
|00004b30| 68 61 6e 67 65 0a 74 68 | 65 20 76 61 6c 75 65 20 |hange.th|e value |
|00004b40| 6f 66 20 74 68 69 73 20 | 76 61 72 69 61 62 6c 65 |of this |variable|
|00004b50| 20 61 6e 64 20 74 68 65 | 20 76 61 72 69 61 62 6c | and the| variabl|
|00004b60| 65 73 20 60 65 64 69 66 | 66 2d 68 65 6c 70 2d 6d |es `edif|f-help-m|
|00004b70| 65 73 73 61 67 65 2d 2a | 27 20 69 6e 0a 60 65 64 |essage-*|' in.`ed|
|00004b80| 69 66 66 2d 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |iff-star|tup-hook|
|00004b90| 27 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |'...(def|var edif|
|00004ba0| 66 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 20 22 |f-help-m|essage "|
|00004bb0| 22 20 28 23 24 20 2e 20 | 31 39 30 38 35 29 29 0a |" (#$ . |19085)).|
|00004bc0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004bd0| c2 c1 c3 c4 23 88 c5 16 | 06 c6 0e 07 42 16 07 c8 |....#...|....B...|
|00004be0| 16 09 c9 0e 07 42 16 07 | ca 16 0b cb 0e 07 42 16 |.....B..|......B.|
|00004bf0| 07 c0 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |..." [ma|ke-varia|
|00004c00| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00004c10| 20 65 64 69 66 66 2d 68 | 65 6c 70 2d 6d 65 73 73 | ediff-h|elp-mess|
|00004c20| 61 67 65 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |age put |permanen|
|00004c30| 74 2d 6c 6f 63 61 6c 20 | 74 20 22 59 6f 75 20 68 |t-local |t "You h|
|00004c40| 61 76 65 20 6b 69 6c 6c | 65 64 20 61 20 76 69 74 |ave kill|ed a vit|
|00004c50| 61 6c 20 45 64 69 66 66 | 20 62 75 66 66 65 72 2d |al Ediff| buffer-|
|00004c60| 2d 2d 79 6f 75 20 6d 75 | 73 74 20 6c 65 61 76 65 |--you mu|st leave|
|00004c70| 20 45 64 69 66 66 20 6e | 6f 77 21 22 20 65 64 69 | Ediff n|ow!" edi|
|00004c80| 66 66 2d 4b 49 4c 4c 45 | 44 2d 56 49 54 41 4c 2d |ff-KILLE|D-VITAL-|
|00004c90| 42 55 46 46 45 52 20 63 | 75 72 72 65 6e 74 2d 6c |BUFFER c|urrent-l|
|00004ca0| 6f 61 64 2d 6c 69 73 74 | 20 22 53 6f 72 72 79 2c |oad-list| "Sorry,|
|00004cb0| 20 63 6f 6d 70 61 72 69 | 73 6f 6e 20 6f 66 20 69 | compari|son of i|
|00004cc0| 64 65 6e 74 69 63 61 6c | 20 76 61 72 69 61 6e 74 |dentical| variant|
|00004cd0| 73 20 69 73 20 6e 6f 74 | 20 77 68 61 74 20 49 20 |s is not| what I |
|00004ce0| 61 6d 20 6d 61 64 65 20 | 66 6f 72 2e 2e 2e 22 20 |am made |for..." |
|00004cf0| 65 64 69 66 66 2d 4e 4f | 2d 44 49 46 46 45 52 45 |ediff-NO|-DIFFERE|
|00004d00| 4e 43 45 53 20 22 25 53 | 3a 20 42 61 64 20 64 69 |NCES "%S|: Bad di|
|00004d10| 66 66 20 72 65 67 69 6f | 6e 20 6e 75 6d 62 65 72 |ff regio|n number|
|00004d20| 2c 20 25 64 2e 20 56 61 | 6c 69 64 20 6e 75 6d 62 |, %d. Va|lid numb|
|00004d30| 65 72 73 20 61 72 65 20 | 31 20 74 6f 20 25 64 22 |ers are |1 to %d"|
|00004d40| 20 65 64 69 66 66 2d 42 | 41 44 2d 44 49 46 46 2d | ediff-B|AD-DIFF-|
|00004d50| 4e 55 4d 42 45 52 5d 20 | 34 29 0a 23 40 32 37 39 |NUMBER] |4).#@279|
|00004d60| 20 46 75 6e 63 74 69 6f | 6e 20 74 68 61 74 20 64 | Functio|n that d|
|00004d70| 65 74 65 72 6d 69 6e 65 | 73 20 74 68 65 20 6e 65 |etermine|s the ne|
|00004d80| 78 74 2f 70 72 65 76 69 | 6f 75 73 20 64 69 66 66 |xt/previ|ous diff|
|00004d90| 20 72 65 67 69 6f 6e 20 | 74 6f 20 73 68 6f 77 2e | region |to show.|
|00004da0| 0a 53 68 6f 75 6c 64 20 | 72 65 74 75 72 6e 20 74 |.Should |return t|
|00004db0| 20 66 6f 72 20 72 65 67 | 69 6f 6e 73 20 74 6f 20 | for reg|ions to |
|00004dc0| 62 65 20 69 67 6e 6f 72 | 65 64 20 61 6e 64 20 6e |be ignor|ed and n|
|00004dd0| 69 6c 20 6f 74 68 65 72 | 77 69 73 65 2e 0a 54 68 |il other|wise..Th|
|00004de0| 69 73 20 66 75 6e 63 74 | 69 6f 6e 20 67 65 74 73 |is funct|ion gets|
|00004df0| 20 61 20 72 65 67 69 6f | 6e 20 6e 75 6d 62 65 72 | a regio|n number|
|00004e00| 20 61 73 20 61 6e 20 61 | 72 67 75 6d 65 6e 74 2e | as an a|rgument.|
|00004e10| 20 54 68 65 20 72 65 67 | 69 6f 6e 20 6e 75 6d 62 | The reg|ion numb|
|00004e20| 65 72 0a 69 73 20 74 68 | 65 20 6f 6e 65 20 75 73 |er.is th|e one us|
|00004e30| 65 64 20 69 6e 74 65 72 | 6e 61 6c 6c 79 20 62 79 |ed inter|nally by|
|00004e40| 20 45 64 69 66 66 2e 20 | 49 74 20 69 73 20 31 20 | Ediff. |It is 1 |
|00004e50| 6c 65 73 73 20 74 68 61 | 6e 20 74 68 65 20 6e 75 |less tha|n the nu|
|00004e60| 6d 62 65 72 20 73 65 65 | 6e 0a 62 79 20 74 68 65 |mber see|n.by the|
|00004e70| 20 75 73 65 72 2e 1f 0a | 28 64 65 66 76 61 72 20 | user...|(defvar |
|00004e80| 65 64 69 66 66 2d 73 6b | 69 70 2d 64 69 66 66 2d |ediff-sk|ip-diff-|
|00004e90| 72 65 67 69 6f 6e 2d 66 | 75 6e 63 74 69 6f 6e 20 |region-f|unction |
|00004ea0| 28 71 75 6f 74 65 20 65 | 64 69 66 66 2d 73 68 6f |(quote e|diff-sho|
|00004eb0| 77 2d 61 6c 6c 2d 64 69 | 66 66 73 29 20 28 23 24 |w-all-di|ffs) (#$|
|00004ec0| 20 2e 20 31 39 38 30 39 | 29 29 0a 28 62 79 74 65 | . 19809|)).(byte|
|00004ed0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00004ee0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00004ef0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00004f00| 64 69 66 66 2d 73 6b 69 | 70 2d 64 69 66 66 2d 72 |diff-ski|p-diff-r|
|00004f10| 65 67 69 6f 6e 2d 66 75 | 6e 63 74 69 6f 6e 20 70 |egion-fu|nction p|
|00004f20| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00004f30| 61 6c 20 74 5d 20 34 29 | 0a 23 40 31 32 38 20 46 |al t] 4)|.#@128 F|
|00004f40| 75 6e 63 74 69 6f 6e 20 | 74 6f 20 75 73 65 20 69 |unction |to use i|
|00004f50| 6e 20 64 65 74 65 72 6d | 69 6e 69 6e 67 20 77 68 |n determ|ining wh|
|00004f60| 69 63 68 20 72 65 67 69 | 6f 6e 73 20 74 6f 20 68 |ich regi|ons to h|
|00004f70| 69 64 65 2e 0a 53 65 65 | 20 74 68 65 20 64 6f 63 |ide..See| the doc|
|00004f80| 75 6d 65 6e 74 61 74 69 | 6f 6e 20 73 74 72 69 6e |umentati|on strin|
|00004f90| 67 20 6f 66 20 60 65 64 | 69 66 66 2d 68 69 64 65 |g of `ed|iff-hide|
|00004fa0| 2d 72 65 67 65 78 70 2d | 6d 61 74 63 68 65 73 27 |-regexp-|matches'|
|00004fb0| 20 66 6f 72 20 64 65 74 | 61 69 6c 73 2e 1f 0a 28 | for det|ails...(|
|00004fc0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 68 69 64 |defvar e|diff-hid|
|00004fd0| 65 2d 72 65 67 65 78 70 | 2d 6d 61 74 63 68 65 73 |e-regexp|-matches|
|00004fe0| 2d 66 75 6e 63 74 69 6f | 6e 20 28 71 75 6f 74 65 |-functio|n (quote|
|00004ff0| 20 65 64 69 66 66 2d 68 | 69 64 65 2d 72 65 67 65 | ediff-h|ide-rege|
|00005000| 78 70 2d 6d 61 74 63 68 | 65 73 29 20 28 23 24 20 |xp-match|es) (#$ |
|00005010| 2e 20 32 30 32 38 37 29 | 29 0a 28 62 79 74 65 2d |. 20287)|).(byte-|
|00005020| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00005030| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00005040| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00005050| 69 66 66 2d 68 69 64 65 | 2d 72 65 67 65 78 70 2d |iff-hide|-regexp-|
|00005060| 6d 61 74 63 68 65 73 2d | 66 75 6e 63 74 69 6f 6e |matches-|function|
|00005070| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00005080| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 31 33 36 |ocal t] |4).#@136|
|00005090| 20 46 75 6e 63 74 69 6f | 6e 20 74 6f 20 75 73 65 | Functio|n to use|
|000050a0| 20 69 6e 20 64 65 74 65 | 72 6d 69 6e 69 6e 67 20 | in dete|rmining |
|000050b0| 77 68 69 63 68 20 72 65 | 67 69 6f 6e 73 20 74 6f |which re|gions to|
|000050c0| 20 66 6f 63 75 73 20 6f | 6e 2e 0a 53 65 65 20 74 | focus o|n..See t|
|000050d0| 68 65 20 64 6f 63 75 6d | 65 6e 74 61 74 69 6f 6e |he docum|entation|
|000050e0| 20 73 74 72 69 6e 67 20 | 6f 66 20 60 65 64 69 66 | string |of `edif|
|000050f0| 66 2d 66 6f 63 75 73 2d | 6f 6e 2d 72 65 67 65 78 |f-focus-|on-regex|
|00005100| 70 2d 6d 61 74 63 68 65 | 73 27 20 66 6f 72 20 64 |p-matche|s' for d|
|00005110| 65 74 61 69 6c 73 2e 1f | 0a 28 64 65 66 76 61 72 |etails..|.(defvar|
|00005120| 20 65 64 69 66 66 2d 66 | 6f 63 75 73 2d 6f 6e 2d | ediff-f|ocus-on-|
|00005130| 72 65 67 65 78 70 2d 6d | 61 74 63 68 65 73 2d 66 |regexp-m|atches-f|
|00005140| 75 6e 63 74 69 6f 6e 20 | 28 71 75 6f 74 65 20 65 |unction |(quote e|
|00005150| 64 69 66 66 2d 66 6f 63 | 75 73 2d 6f 6e 2d 72 65 |diff-foc|us-on-re|
|00005160| 67 65 78 70 2d 6d 61 74 | 63 68 65 73 29 20 28 23 |gexp-mat|ches) (#|
|00005170| 24 20 2e 20 32 30 36 32 | 35 29 29 0a 28 62 79 74 |$ . 2062|5)).(byt|
|00005180| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00005190| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000051a0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000051b0| 65 64 69 66 66 2d 66 6f | 63 75 73 2d 6f 6e 2d 72 |ediff-fo|cus-on-r|
|000051c0| 65 67 65 78 70 2d 6d 61 | 74 63 68 65 73 2d 66 75 |egexp-ma|tches-fu|
|000051d0| 6e 63 74 69 6f 6e 20 70 | 75 74 20 70 65 72 6d 61 |nction p|ut perma|
|000051e0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|000051f0| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|00005200| 64 69 66 66 2d 72 65 67 | 65 78 70 2d 66 6f 63 75 |diff-reg|exp-focu|
|00005210| 73 2d 41 20 22 22 20 28 | 23 24 20 2e 20 32 30 39 |s-A "" (|#$ . 209|
|00005220| 38 31 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |81)).(by|te-code |
|00005230| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005240| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00005250| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 72 |er-local| ediff-r|
|00005260| 65 67 65 78 70 2d 66 6f | 63 75 73 2d 41 20 70 75 |egexp-fo|cus-A pu|
|00005270| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005280| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00005290| 65 66 76 61 72 20 65 64 | 69 66 66 2d 72 65 67 65 |efvar ed|iff-rege|
|000052a0| 78 70 2d 66 6f 63 75 73 | 2d 42 20 22 22 20 28 23 |xp-focus|-B "" (#|
|000052b0| 24 20 2e 20 32 31 31 33 | 32 29 29 0a 28 62 79 74 |$ . 2113|2)).(byt|
|000052c0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000052d0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000052e0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000052f0| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 66 6f 63 |ediff-re|gexp-foc|
|00005300| 75 73 2d 42 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |us-B put| permane|
|00005310| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 23 |nt-local| t] 4).#|
|00005320| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00005330| 66 66 2d 72 65 67 65 78 | 70 2d 66 6f 63 75 73 2d |ff-regex|p-focus-|
|00005340| 43 20 22 22 20 28 23 24 | 20 2e 20 32 31 32 38 33 |C "" (#$| . 21283|
|00005350| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00005360| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00005370| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00005380| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 72 65 67 |-local e|diff-reg|
|00005390| 65 78 70 2d 66 6f 63 75 | 73 2d 43 20 70 75 74 20 |exp-focu|s-C put |
|000053a0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000053b0| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|000053c0| 76 61 72 20 65 64 69 66 | 66 2d 66 6f 63 75 73 2d |var edif|f-focus-|
|000053d0| 72 65 67 65 78 70 2d 63 | 6f 6e 6e 65 63 74 69 76 |regexp-c|onnectiv|
|000053e0| 65 20 28 71 75 6f 74 65 | 20 61 6e 64 29 20 28 23 |e (quote| and) (#|
|000053f0| 24 20 2e 20 32 31 34 33 | 34 29 29 0a 28 62 79 74 |$ . 2143|4)).(byt|
|00005400| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00005410| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00005420| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00005430| 65 64 69 66 66 2d 66 6f | 63 75 73 2d 72 65 67 65 |ediff-fo|cus-rege|
|00005440| 78 70 2d 63 6f 6e 6e 65 | 63 74 69 76 65 20 70 75 |xp-conne|ctive pu|
|00005450| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005460| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00005470| 65 66 76 61 72 20 65 64 | 69 66 66 2d 72 65 67 65 |efvar ed|iff-rege|
|00005480| 78 70 2d 68 69 64 65 2d | 41 20 22 22 20 28 23 24 |xp-hide-|A "" (#$|
|00005490| 20 2e 20 32 31 36 31 32 | 29 29 0a 28 62 79 74 65 | . 21612|)).(byte|
|000054a0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000054b0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000054c0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000054d0| 64 69 66 66 2d 72 65 67 | 65 78 70 2d 68 69 64 65 |diff-reg|exp-hide|
|000054e0| 2d 41 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |-A put p|ermanent|
|000054f0| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 32 |-local t|] 4).#@2|
|00005500| 20 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 | ..(defv|ar ediff|
|00005510| 2d 72 65 67 65 78 70 2d | 68 69 64 65 2d 42 20 22 |-regexp-|hide-B "|
|00005520| 22 20 28 23 24 20 2e 20 | 32 31 37 36 31 29 29 0a |" (#$ . |21761)).|
|00005530| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00005540| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00005550| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00005560| 63 61 6c 20 65 64 69 66 | 66 2d 72 65 67 65 78 70 |cal edif|f-regexp|
|00005570| 2d 68 69 64 65 2d 42 20 | 70 75 74 20 70 65 72 6d |-hide-B |put perm|
|00005580| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00005590| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|000055a0| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 68 69 64 |ediff-re|gexp-hid|
|000055b0| 65 2d 43 20 22 22 20 28 | 23 24 20 2e 20 32 31 39 |e-C "" (|#$ . 219|
|000055c0| 31 30 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |10)).(by|te-code |
|000055d0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000055e0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000055f0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 72 |er-local| ediff-r|
|00005600| 65 67 65 78 70 2d 68 69 | 64 65 2d 43 20 70 75 74 |egexp-hi|de-C put|
|00005610| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00005620| 20 74 5d 20 34 29 0a 23 | 40 32 20 1f 0a 28 64 65 | t] 4).#|@2 ..(de|
|00005630| 66 76 61 72 20 65 64 69 | 66 66 2d 68 69 64 65 2d |fvar edi|ff-hide-|
|00005640| 72 65 67 65 78 70 2d 63 | 6f 6e 6e 65 63 74 69 76 |regexp-c|onnectiv|
|00005650| 65 20 28 71 75 6f 74 65 | 20 61 6e 64 29 20 28 23 |e (quote| and) (#|
|00005660| 24 20 2e 20 32 32 30 35 | 39 29 29 0a 28 62 79 74 |$ . 2205|9)).(byt|
|00005670| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00005680| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00005690| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000056a0| 65 64 69 66 66 2d 68 69 | 64 65 2d 72 65 67 65 78 |ediff-hi|de-regex|
|000056b0| 70 2d 63 6f 6e 6e 65 63 | 74 69 76 65 20 70 75 74 |p-connec|tive put|
|000056c0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|000056d0| 20 74 5d 20 34 29 0a 23 | 40 35 35 20 46 75 6e 63 | t] 4).#|@55 Func|
|000056e0| 74 69 6f 6e 20 61 6e 67 | 65 2d 66 74 70 20 75 73 |tion ang|e-ftp us|
|000056f0| 65 73 20 74 6f 20 66 69 | 6e 64 20 6f 75 74 20 69 |es to fi|nd out i|
|00005700| 66 20 66 69 6c 65 20 69 | 73 20 72 65 6d 6f 74 65 |f file i|s remote|
|00005710| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|00005720| 2d 61 6e 67 65 2d 66 74 | 70 2d 66 74 70 2d 6e 61 |-ange-ft|p-ftp-na|
|00005730| 6d 65 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 08 |me (byte|-code ".|
|00005740| 83 06 00 c1 87 c2 87 22 | 20 5b 65 64 69 66 66 2d |......."| [ediff-|
|00005750| 78 65 6d 61 63 73 2d 70 | 20 61 6e 67 65 2d 66 74 |xemacs-p| ange-ft|
|00005760| 70 2d 66 74 70 2d 70 61 | 74 68 20 61 6e 67 65 2d |p-ftp-pa|th ange-|
|00005770| 66 74 70 2d 66 74 70 2d | 6e 61 6d 65 5d 20 31 29 |ftp-ftp-|name] 1)|
|00005780| 20 28 23 24 20 2e 20 32 | 32 32 33 36 29 29 0a 23 | (#$ . 2|2236)).#|
|00005790| 40 32 34 30 20 41 20 6c | 69 73 74 20 6f 66 20 6b |@240 A l|ist of k|
|000057a0| 69 6c 6c 65 64 20 64 69 | 66 66 73 2e 20 0a 41 20 |illed di|ffs. .A |
|000057b0| 64 69 66 66 20 69 73 20 | 73 61 76 65 64 20 68 65 |diff is |saved he|
|000057c0| 72 65 20 69 66 20 69 74 | 20 69 73 20 72 65 70 6c |re if it| is repl|
|000057d0| 61 63 65 64 20 62 79 20 | 61 20 64 69 66 66 0a 66 |aced by |a diff.f|
|000057e0| 72 6f 6d 20 61 6e 6f 74 | 68 65 72 20 62 75 66 66 |rom anot|her buff|
|000057f0| 65 72 2e 20 20 54 68 69 | 73 20 61 6c 69 73 74 20 |er. Thi|s alist |
|00005800| 68 61 73 20 74 68 65 20 | 66 6f 72 6d 3a 0a 28 28 |has the |form:.((|
|00005810| 6e 75 6d 20 28 62 75 66 | 66 2d 6f 62 6a 65 63 74 |num (buf|f-object|
|00005820| 20 2e 20 64 69 66 66 29 | 20 28 62 75 66 66 2d 6f | . diff)| (buff-o|
|00005830| 62 6a 65 63 74 20 2e 20 | 64 69 66 66 29 20 28 62 |bject . |diff) (b|
|00005840| 75 66 66 2d 6f 62 6a 65 | 63 74 20 2e 20 64 69 66 |uff-obje|ct . dif|
|00005850| 66 29 29 20 2e 2e 2e 29 | 2c 0a 77 68 65 72 65 20 |f)) ...)|,.where |
|00005860| 73 6f 6d 65 20 62 75 66 | 66 65 72 2d 6f 62 6a 65 |some buf|fer-obje|
|00005870| 63 74 73 20 6d 61 79 20 | 62 65 20 6d 69 73 73 69 |cts may |be missi|
|00005880| 6e 67 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ng...(de|fvar edi|
|00005890| 66 66 2d 6b 69 6c 6c 65 | 64 2d 64 69 66 66 73 2d |ff-kille|d-diffs-|
|000058a0| 61 6c 69 73 74 20 6e 69 | 6c 20 28 23 24 20 2e 20 |alist ni|l (#$ . |
|000058b0| 32 32 34 32 31 29 29 0a | 28 62 79 74 65 2d 63 6f |22421)).|(byte-co|
|000058c0| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|000058d0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000058e0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|000058f0| 66 2d 6b 69 6c 6c 65 64 | 2d 64 69 66 66 73 2d 61 |f-killed|-diffs-a|
|00005900| 6c 69 73 74 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |list put| permane|
|00005910| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 23 |nt-local| t] 4).#|
|00005920| 40 38 32 20 2a 46 6c 61 | 67 20 70 6c 61 63 65 64 |@82 *Fla|g placed|
|00005930| 20 61 62 6f 76 65 20 74 | 68 65 20 68 69 67 68 6c | above t|he highl|
|00005940| 69 67 68 74 65 64 20 62 | 6c 6f 63 6b 20 6f 66 20 |ighted b|lock of |
|00005950| 64 69 66 66 65 72 65 6e | 63 65 73 2e 20 0a 4d 75 |differen|ces. .Mu|
|00005960| 73 74 20 65 6e 64 20 77 | 69 74 68 20 6e 65 77 6c |st end w|ith newl|
|00005970| 69 6e 65 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |ine...(d|efvar ed|
|00005980| 69 66 66 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 2d |iff-befo|re-flag-|
|00005990| 62 6f 6c 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |bol (byt|e-code "|
|000059a0| 08 83 08 00 c1 c2 21 87 | c2 87 22 20 5b 65 64 69 |......!.|.." [edi|
|000059b0| 66 66 2d 78 65 6d 61 63 | 73 2d 70 20 6d 61 6b 65 |ff-xemac|s-p make|
|000059c0| 2d 67 6c 79 70 68 20 22 | 2d 3e 3e 22 5d 20 32 29 |-glyph "|->>"] 2)|
|000059d0| 20 28 23 24 20 2e 20 2d | 32 32 38 32 30 29 29 0a | (#$ . -|22820)).|
|000059e0| 23 40 38 31 20 2a 46 6c | 61 67 20 70 6c 61 63 65 |#@81 *Fl|ag place|
|000059f0| 64 20 62 65 6c 6f 77 20 | 74 68 65 20 68 69 67 68 |d below |the high|
|00005a00| 6c 69 67 68 74 65 64 20 | 62 6c 6f 63 6b 20 6f 66 |lighted |block of|
|00005a10| 20 64 69 66 66 65 72 65 | 6e 63 65 73 2e 0a 4d 75 | differe|nces..Mu|
|00005a20| 73 74 20 65 6e 64 20 77 | 69 74 68 20 6e 65 77 6c |st end w|ith newl|
|00005a30| 69 6e 65 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |ine...(d|efvar ed|
|00005a40| 69 66 66 2d 61 66 74 65 | 72 2d 66 6c 61 67 2d 65 |iff-afte|r-flag-e|
|00005a50| 6f 6c 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 08 |ol (byte|-code ".|
|00005a60| 83 08 00 c1 c2 21 87 c2 | 87 22 20 5b 65 64 69 66 |.....!..|." [edif|
|00005a70| 66 2d 78 65 6d 61 63 73 | 2d 70 20 6d 61 6b 65 2d |f-xemacs|-p make-|
|00005a80| 67 6c 79 70 68 20 22 3c | 3c 2d 22 5d 20 32 29 20 |glyph "<|<-"] 2) |
|00005a90| 28 23 24 20 2e 20 2d 32 | 33 30 31 33 29 29 0a 23 |(#$ . -2|3013)).#|
|00005aa0| 40 36 39 20 2a 4c 69 6b | 65 20 65 64 69 66 66 2d |@69 *Lik|e ediff-|
|00005ab0| 62 65 66 6f 72 65 2d 66 | 6c 61 67 2c 20 75 73 65 |before-f|lag, use|
|00005ac0| 64 20 77 68 65 6e 20 61 | 20 64 69 66 66 65 72 65 |d when a| differe|
|00005ad0| 6e 63 65 20 73 74 61 72 | 74 73 20 69 6e 20 6d 69 |nce star|ts in mi|
|00005ae0| 64 2d 6c 69 6e 65 2e 1f | 0a 28 64 65 66 76 61 72 |d-line..|.(defvar|
|00005af0| 20 65 64 69 66 66 2d 62 | 65 66 6f 72 65 2d 66 6c | ediff-b|efore-fl|
|00005b00| 61 67 2d 6d 6f 6c 20 28 | 62 79 74 65 2d 63 6f 64 |ag-mol (|byte-cod|
|00005b10| 65 20 22 08 83 08 00 c1 | c2 21 87 c2 87 22 20 5b |e ".....|.!..." [|
|00005b20| 65 64 69 66 66 2d 78 65 | 6d 61 63 73 2d 70 20 6d |ediff-xe|macs-p m|
|00005b30| 61 6b 65 2d 67 6c 79 70 | 68 20 22 2d 3e 3e 22 5d |ake-glyp|h "->>"]|
|00005b40| 20 32 29 20 28 23 24 20 | 2e 20 2d 32 33 32 30 34 | 2) (#$ |. -23204|
|00005b50| 29 29 0a 23 40 36 38 20 | 2a 4c 69 6b 65 20 65 64 |)).#@68 |*Like ed|
|00005b60| 69 66 66 2d 61 66 74 65 | 72 2d 66 6c 61 67 2c 20 |iff-afte|r-flag, |
|00005b70| 75 73 65 64 20 77 68 65 | 6e 20 61 20 64 69 66 66 |used whe|n a diff|
|00005b80| 65 72 65 6e 63 65 20 73 | 74 61 72 74 73 20 69 6e |erence s|tarts in|
|00005b90| 20 6d 69 64 2d 6c 69 6e | 65 2e 1f 0a 28 64 65 66 | mid-lin|e...(def|
|00005ba0| 76 61 72 20 65 64 69 66 | 66 2d 61 66 74 65 72 2d |var edif|f-after-|
|00005bb0| 66 6c 61 67 2d 6d 6f 6c | 20 28 62 79 74 65 2d 63 |flag-mol| (byte-c|
|00005bc0| 6f 64 65 20 22 08 83 08 | 00 c1 c2 21 87 c2 87 22 |ode "...|...!..."|
|00005bd0| 20 5b 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 | [ediff-|xemacs-p|
|00005be0| 20 6d 61 6b 65 2d 67 6c | 79 70 68 20 22 3c 3c 2d | make-gl|yph "<<-|
|00005bf0| 22 5d 20 32 29 20 28 23 | 24 20 2e 20 2d 32 33 33 |"] 2) (#|$ . -233|
|00005c00| 38 34 29 29 0a 23 40 33 | 35 39 20 49 66 20 74 2c |84)).#@3|59 If t,|
|00005c10| 20 64 69 66 66 65 72 65 | 6e 63 65 73 20 61 72 65 | differe|nces are|
|00005c20| 20 68 69 67 68 6c 69 67 | 68 74 65 64 20 75 73 69 | highlig|hted usi|
|00005c30| 6e 67 20 66 61 63 65 73 | 2c 20 69 66 20 64 65 76 |ng faces|, if dev|
|00005c40| 69 63 65 20 73 75 70 70 | 6f 72 74 73 20 66 61 63 |ice supp|orts fac|
|00005c50| 65 73 2e 0a 49 66 20 6e | 69 6c 2c 20 64 69 66 66 |es..If n|il, diff|
|00005c60| 65 72 65 6e 63 65 73 20 | 61 72 65 20 68 69 67 68 |erences |are high|
|00005c70| 6c 69 67 68 74 65 64 20 | 75 73 69 6e 67 20 41 53 |lighted |using AS|
|00005c80| 43 49 49 20 66 6c 61 67 | 73 2c 20 65 64 69 66 66 |CII flag|s, ediff|
|00005c90| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 0a 61 6e 64 |-before-|flag.and|
|00005ca0| 20 65 64 69 66 66 2d 61 | 66 74 65 72 2d 66 6c 61 | ediff-a|fter-fla|
|00005cb0| 67 2e 20 20 4f 6e 20 61 | 20 6e 6f 6e 2d 77 69 6e |g. On a| non-win|
|00005cc0| 64 6f 77 20 73 79 73 74 | 65 6d 2c 20 64 69 66 66 |dow syst|em, diff|
|00005cd0| 65 72 65 6e 63 65 73 20 | 61 72 65 20 61 6c 77 61 |erences |are alwa|
|00005ce0| 79 73 0a 68 69 67 68 6c | 69 67 68 74 65 64 20 75 |ys.highl|ighted u|
|00005cf0| 73 69 6e 67 20 41 53 43 | 49 49 20 66 6c 61 67 73 |sing ASC|II flags|
|00005d00| 2e 0a 54 68 69 73 20 76 | 61 72 69 61 62 6c 65 20 |..This v|ariable |
|00005d10| 63 61 6e 20 62 65 20 73 | 65 74 20 65 69 74 68 65 |can be s|et eithe|
|00005d20| 72 20 69 6e 20 2e 65 6d | 61 63 73 20 6f 72 20 74 |r in .em|acs or t|
|00005d30| 6f 67 67 6c 65 64 20 69 | 6e 74 65 72 61 63 74 69 |oggled i|nteracti|
|00005d40| 76 65 6c 79 2e 0a 55 73 | 65 20 60 73 65 74 71 2d |vely..Us|e `setq-|
|00005d50| 64 65 66 61 75 6c 74 27 | 20 69 66 20 73 65 74 74 |default'| if sett|
|00005d60| 69 6e 67 20 69 74 20 69 | 6e 20 2e 65 6d 61 63 73 |ing it i|n .emacs|
|00005d70| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00005d80| 75 73 65 2d 66 61 63 65 | 73 20 74 20 28 23 24 20 |use-face|s t (#$ |
|00005d90| 2e 20 32 33 35 36 33 29 | 29 0a 28 62 79 74 65 2d |. 23563)|).(byte-|
|00005da0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00005db0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00005dc0| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00005dd0| 69 66 66 2d 75 73 65 2d | 66 61 63 65 73 20 70 75 |iff-use-|faces pu|
|00005de0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005df0| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00005e00| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 6f 72 64 |efvar ed|iff-word|
|00005e10| 2d 6d 6f 64 65 20 6e 69 | 6c 20 28 23 24 20 2e 20 |-mode ni|l (#$ . |
|00005e20| 32 34 30 36 30 29 29 0a | 28 62 79 74 65 2d 63 6f |24060)).|(byte-co|
|00005e30| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00005e40| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00005e50| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00005e60| 66 2d 77 6f 72 64 2d 6d | 6f 64 65 20 70 75 74 20 |f-word-m|ode put |
|00005e70| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00005e80| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|00005e90| 76 61 72 20 65 64 69 66 | 66 2d 6a 6f 62 2d 6e 61 |var edif|f-job-na|
|00005ea0| 6d 65 20 6e 69 6c 20 28 | 23 24 20 2e 20 32 34 32 |me nil (|#$ . 242|
|00005eb0| 30 32 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |02)).(by|te-code |
|00005ec0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005ed0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00005ee0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6a |er-local| ediff-j|
|00005ef0| 6f 62 2d 6e 61 6d 65 20 | 70 75 74 20 70 65 72 6d |ob-name |put perm|
|00005f00| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00005f10| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00005f20| 65 64 69 66 66 2d 6e 61 | 72 72 6f 77 2d 62 6f 75 |ediff-na|rrow-bou|
|00005f30| 6e 64 73 20 6e 69 6c 20 | 28 23 24 20 2e 20 32 34 |nds nil |(#$ . 24|
|00005f40| 33 34 32 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |342)).(b|yte-code|
|00005f50| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00005f60| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00005f70| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00005f80| 6e 61 72 72 6f 77 2d 62 | 6f 75 6e 64 73 20 70 75 |narrow-b|ounds pu|
|00005f90| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005fa0| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00005fb0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 69 64 65 |efvar ed|iff-wide|
|00005fc0| 2d 62 6f 75 6e 64 73 20 | 6e 69 6c 20 28 23 24 20 |-bounds |nil (#$ |
|00005fd0| 2e 20 32 34 34 39 32 29 | 29 0a 28 62 79 74 65 2d |. 24492)|).(byte-|
|00005fe0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00005ff0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00006000| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00006010| 69 66 66 2d 77 69 64 65 | 2d 62 6f 75 6e 64 73 20 |iff-wide|-bounds |
|00006020| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00006030| 63 61 6c 20 74 5d 20 34 | 29 0a 23 40 32 20 1f 0a |cal t] 4|).#@2 ..|
|00006040| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 76 69 |(defvar |ediff-vi|
|00006050| 73 69 62 6c 65 2d 62 6f | 75 6e 64 73 20 6e 69 6c |sible-bo|unds nil|
|00006060| 20 28 23 24 20 2e 20 32 | 34 36 33 38 29 29 0a 28 | (#$ . 2|4638)).(|
|00006070| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00006080| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00006090| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000060a0| 61 6c 20 65 64 69 66 66 | 2d 76 69 73 69 62 6c 65 |al ediff|-visible|
|000060b0| 2d 62 6f 75 6e 64 73 20 | 70 75 74 20 70 65 72 6d |-bounds |put perm|
|000060c0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|000060d0| 29 0a 23 40 37 35 20 4e | 6f 6e 2d 6e 69 6c 20 6d |).#@75 N|on-nil m|
|000060e0| 65 61 6e 73 20 73 74 61 | 72 74 20 6e 61 72 72 6f |eans sta|rt narro|
|000060f0| 77 65 64 2c 20 69 66 20 | 64 6f 69 6e 67 20 65 64 |wed, if |doing ed|
|00006100| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 2a 20 6f 72 |iff-wind|ows-* or|
|00006110| 20 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 2a | ediff-r|egions-*|
|00006120| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00006130| 73 74 61 72 74 2d 6e 61 | 72 72 6f 77 65 64 20 74 |start-na|rrowed t|
|00006140| 20 28 23 24 20 2e 20 32 | 34 37 39 31 29 29 0a 28 | (#$ . 2|4791)).(|
|00006150| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00006160| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00006170| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00006180| 61 6c 20 65 64 69 66 66 | 2d 73 74 61 72 74 2d 6e |al ediff|-start-n|
|00006190| 61 72 72 6f 77 65 64 20 | 70 75 74 20 70 65 72 6d |arrowed |put perm|
|000061a0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|000061b0| 29 0a 23 40 31 33 32 20 | 2a 4e 6f 6e 2d 6e 69 6c |).#@132 |*Non-nil|
|000061c0| 20 6d 65 61 6e 73 3a 20 | 77 68 65 6e 20 66 69 6e | means: |when fin|
|000061d0| 69 73 68 65 64 2c 20 45 | 64 69 66 66 20 77 69 64 |ished, E|diff wid|
|000061e0| 65 6e 73 20 62 75 66 66 | 65 72 73 20 41 2f 42 2e |ens buff|ers A/B.|
|000061f0| 0a 41 63 74 75 61 6c 6c | 79 2c 20 45 64 69 66 66 |.Actuall|y, Ediff|
|00006200| 20 72 65 73 74 6f 72 65 | 73 20 74 68 65 20 73 63 | restore|s the sc|
|00006210| 6f 70 65 20 6f 66 20 76 | 69 73 69 62 69 6c 69 74 |ope of v|isibilit|
|00006220| 79 20 74 68 61 74 20 65 | 78 69 73 74 65 64 20 61 |y that e|xisted a|
|00006230| 74 20 73 74 61 72 74 75 | 70 2e 1f 0a 28 64 65 66 |t startu|p...(def|
|00006240| 76 61 72 20 65 64 69 66 | 66 2d 71 75 69 74 2d 77 |var edif|f-quit-w|
|00006250| 69 64 65 6e 65 64 20 74 | 20 28 23 24 20 2e 20 2d |idened t| (#$ . -|
|00006260| 32 35 30 31 36 29 29 0a | 28 62 79 74 65 2d 63 6f |25016)).|(byte-co|
|00006270| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00006280| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00006290| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|000062a0| 66 2d 71 75 69 74 2d 77 | 69 64 65 6e 65 64 20 70 |f-quit-w|idened p|
|000062b0| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|000062c0| 61 6c 20 74 5d 20 34 29 | 0a 23 40 31 39 33 20 2a |al t] 4)|.#@193 *|
|000062d0| 4e 69 6c 20 6d 65 61 6e | 73 20 74 68 61 74 20 6e |Nil mean|s that n|
|000062e0| 6f 6e 2d 6d 6f 64 69 66 | 69 65 64 20 76 61 72 69 |on-modif|ied vari|
|000062f0| 61 6e 74 20 62 75 66 66 | 65 72 73 20 73 68 6f 75 |ant buff|ers shou|
|00006300| 6c 64 20 62 65 20 72 65 | 6d 6f 76 65 64 20 61 66 |ld be re|moved af|
|00006310| 74 65 72 20 73 6f 6d 65 | 0a 69 6e 74 65 72 72 6f |ter some|.interro|
|00006320| 67 61 74 69 6f 6e 2e 0a | 53 75 70 70 6c 79 69 6e |gation..|Supplyin|
|00006330| 67 20 61 20 70 72 65 66 | 69 78 20 61 72 67 75 6d |g a pref|ix argum|
|00006340| 65 6e 74 20 74 6f 20 74 | 68 65 20 71 75 69 74 20 |ent to t|he quit |
|00006350| 63 6f 6d 6d 61 6e 64 20 | 60 71 27 20 74 65 6d 70 |command |`q' temp|
|00006360| 6f 72 61 72 69 6c 79 20 | 72 65 76 65 72 73 65 73 |orarily |reverses|
|00006370| 20 74 68 65 0a 6d 65 61 | 6e 69 6e 67 20 6f 66 20 | the.mea|ning of |
|00006380| 74 68 69 73 20 76 61 72 | 69 61 62 6c 65 2e 1f 0a |this var|iable...|
|00006390| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6b 65 |(defvar |ediff-ke|
|000063a0| 65 70 2d 76 61 72 69 61 | 6e 74 73 20 74 20 28 23 |ep-varia|nts t (#|
|000063b0| 24 20 2e 20 2d 32 35 32 | 39 35 29 29 0a 23 40 31 |$ . -252|95)).#@1|
|000063c0| 38 30 20 49 66 20 6e 69 | 6c 2c 20 6f 6e 6c 79 20 |80 If ni|l, only |
|000063d0| 74 68 65 20 73 65 6c 65 | 63 74 65 64 20 64 69 66 |the sele|cted dif|
|000063e0| 66 65 72 65 6e 63 65 73 | 20 61 72 65 20 68 69 67 |ferences| are hig|
|000063f0| 68 6c 69 67 68 74 65 64 | 2e 0a 54 68 69 73 20 76 |hlighted|..This v|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
